From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 24 May 2016 17:08:44 +0000 (+0200)
Subject: Added global disable switch for languages
X-Git-Tag: 3.0.0_Beta_1~1640^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=408effbceb4af08088022d87c2fe3fbd4a0a1d15;p=GitHub%2FWoltLab%2FWCF.git

Added global disable switch for languages
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 821f1df839..9b640a6144 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,6 +53,7 @@
 * Added support for embedded youtube playlists
 * Scaled embedded youtube videos to maximum width
 * `\wcf\form\AbstractCaptchaForm`: added parameter to force captcha usage for registered users.
+* Added global disable switch for languages.
 
 #### CMS
 
diff --git a/wcfsetup/install/files/acp/templates/languageList.tpl b/wcfsetup/install/files/acp/templates/languageList.tpl
index b0a637c385..caba703294 100644
--- a/wcfsetup/install/files/acp/templates/languageList.tpl
+++ b/wcfsetup/install/files/acp/templates/languageList.tpl
@@ -13,6 +13,7 @@
 				window.location.reload();
 			}
 		});
+		new WCF.Action.Toggle('wcf\\data\\language\\LanguageAction', $('.jsLanguageRow'));
 	});
 	//]]>
 </script>
@@ -60,12 +61,15 @@
 							<a href="{link controller='LanguageExport' id=$language->languageID}{/link}" title="{lang}wcf.acp.language.export{/lang}" class="jsTooltip"><span class="icon icon16 fa-download"></span></a>
 							
 							{if !$language->isDefault}
-								<span class="icon icon16 fa-check-square-o jsSetAsDefaultButton jsTooltip pointer" title="{lang}wcf.acp.language.setAsDefault{/lang}" title="{lang}wcf.acp.language.setAsDefault{/lang}" data-object-id="{@$language->languageID}"></span>
+								<span class="icon icon16 fa-{if !$language->isDisabled}check-{/if}square-o jsToggleButton jsTooltip pointer" title="{lang}wcf.global.button.{if $language->isDisabled}enable{else}disable{/if}{/lang}" data-object-id="{@$language->languageID}"></span>
+								<span class="icon icon16 fa-check-circle jsSetAsDefaultButton jsTooltip pointer" title="{lang}wcf.acp.language.setAsDefault{/lang}" title="{lang}wcf.acp.language.setAsDefault{/lang}" data-object-id="{@$language->languageID}"></span>
 							{else}
-								<span class="icon icon16 fa-check-square-o disabled" title="{lang}wcf.acp.language.setAsDefault{/lang}"></span>
+								<span class="icon icon16 fa-{if !$language->isDisabled}check-{/if}square-o disabled" title="{lang}wcf.global.button.{if $language->isDisabled}enable{else}disable{/if}{/lang}"></span>
+								<span class="icon icon16 fa-check-circle disabled" title="{lang}wcf.acp.language.setAsDefault{/lang}"></span>
 							{/if}
 							
 							<a href="{link controller='LanguageEdit' id=$language->languageID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							
 							{if !$language->isDefault}
 								<span class="icon icon16 fa-times jsTooltip jsDeleteButton pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$language->languageID}" data-confirm-message="{lang}wcf.acp.language.delete.sure{/lang}"></span>
 							{else}
diff --git a/wcfsetup/install/files/lib/data/language/LanguageAction.class.php b/wcfsetup/install/files/lib/data/language/LanguageAction.class.php
index 20bb5853f1..72a443f81c 100644
--- a/wcfsetup/install/files/lib/data/language/LanguageAction.class.php
+++ b/wcfsetup/install/files/lib/data/language/LanguageAction.class.php
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\data\language;
 use wcf\data\AbstractDatabaseObjectAction;
+use wcf\data\IToggleAction;
 use wcf\system\WCF;
 
 /**
@@ -17,7 +18,7 @@ use wcf\system\WCF;
  * @method	LanguageEditor[]	getObjects()
  * @method	LanguageEditor		getSingleObject()
  */
-class LanguageAction extends AbstractDatabaseObjectAction {
+class LanguageAction extends AbstractDatabaseObjectAction implements IToggleAction {
 	/**
 	 * @inheritDoc
 	 */
@@ -64,4 +65,27 @@ class LanguageAction extends AbstractDatabaseObjectAction {
 	public function setAsDefault() {
 		$this->languageEditor->setAsDefault();
 	}
+	
+	/**
+	 * @inheritdoc
+	 */
+	public function validateToggle() {
+		parent::validateUpdate();
+		
+		foreach ($this->objects as $language) {
+			if ($language->isDefault) {
+				throw new UserInputException('objectIDs');
+			}
+		}
+	}
+	
+	/**
+	 * @inheritdoc
+	 */
+	public function toggle() {
+		foreach ($this->objects as $language) {
+			$isDisabled = ($language->isDisabled) ? 0 : 1;
+			$language->update(['isDisabled' => $isDisabled]);
+		}
+	}
 }
diff --git a/wcfsetup/install/files/lib/system/cache/builder/LanguageCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/LanguageCacheBuilder.class.php
index cfd4ac6af6..fc141893f2 100644
--- a/wcfsetup/install/files/lib/system/cache/builder/LanguageCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/LanguageCacheBuilder.class.php
@@ -31,6 +31,7 @@ class LanguageCacheBuilder extends AbstractCacheBuilder {
 		
 		// get languages
 		$languageList = new LanguageList();
+		$languageList->getConditionBuilder()->add('language.isDisabled = ?', [0]);
 		$languageList->readObjects();
 		$data['languages'] = $languageList->getObjects();
 		foreach ($languageList->getObjects() as $language) {
diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index a3f06dc442..29f617b29a 100644
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -485,6 +485,7 @@ CREATE TABLE wcf1_language (
 	countryCode VARCHAR(10) NOT NULL DEFAULT '',
 	isDefault TINYINT(1) NOT NULL DEFAULT 0,
 	hasContent TINYINT(1) NOT NULL DEFAULT 0,
+	isDisabled TINYINT(1) NOT NULL DEFAULT 0,
 	UNIQUE KEY languageCode (languageCode)
 );