From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 2 Jul 2016 12:04:07 +0000 (+0200)
Subject: Label group for labels is now permanent
X-Git-Tag: 3.0.0_Beta_1~1274
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2498a7762024d3464844b8d0511879ad934f4286;p=GitHub%2FWoltLab%2FWCF.git

Label group for labels is now permanent
---

diff --git a/wcfsetup/install/files/acp/templates/labelAdd.tpl b/wcfsetup/install/files/acp/templates/labelAdd.tpl
index 9f92474bdc..a0767317db 100644
--- a/wcfsetup/install/files/acp/templates/labelAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/labelAdd.tpl
@@ -43,12 +43,13 @@
 			<dl{if $errorField == 'groupID'} class="formError"{/if}>
 				<dt><label for="groupID">{lang}wcf.acp.label.group{/lang}</label></dt>
 				<dd>
-					<select id="groupID" name="groupID">
+					<select id="groupID" name="groupID"{if $action == 'edit'} disabled{/if}>
 						<option value="0">{lang}wcf.global.noSelection{/lang}</option>
 						{foreach from=$labelGroupList item=group}
 							<option value="{@$group->groupID}"{if $group->groupID == $groupID} selected{/if}>{$group}{if $group->groupDescription} / {$group->groupDescription}{/if}</option>
 						{/foreach}
 					</select>
+					<small>{lang}wcf.acp.label.group.permanentSelection{/lang}</small>
 					{if $errorField == 'groupID'}
 						<small class="innerError">
 							{if $errorType == 'empty'}
diff --git a/wcfsetup/install/files/lib/acp/form/LabelEditForm.class.php b/wcfsetup/install/files/lib/acp/form/LabelEditForm.class.php
index 1d722d38b7..8bc5a70ae7 100644
--- a/wcfsetup/install/files/lib/acp/form/LabelEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/LabelEditForm.class.php
@@ -35,9 +35,9 @@ class LabelEditForm extends LabelAddForm {
 	
 	/**
 	 * label object
-	 * @var	\wcf\data\label\Label
+	 * @var	Label
 	 */
-	public $labelObj = null;
+	public $labelObj;
 	
 	/**
 	 * @inheritDoc
@@ -68,10 +68,12 @@ class LabelEditForm extends LabelAddForm {
 		}
 		
 		// update label
+		
+		// groupID is immutable because altering it would cause issues with objects that are
+		// assigned to them, but the new group is not allowed at their current position  
 		$this->objectAction = new LabelAction([$this->labelID], 'update', ['data' => array_merge($this->additionalFields, [
 			'label' => $this->label,
 			'cssClassName' => ($this->cssClassName == 'custom' ? $this->customCssClassName : $this->cssClassName),
-			'groupID' => $this->groupID,
 			'showOrder' => $this->showOrder
 		])]);
 		$this->objectAction->executeAction();
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 7159a3ed1d..70390b1106 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -536,6 +536,7 @@
 		<item name="wcf.acp.label.group.error.notValid"><![CDATA[Die gewählte Labelgruppe ist ungültig.]]></item>
 		<item name="wcf.acp.label.group.forceSelection"><![CDATA[Label aus dieser Gruppe muss zwingend ausgewählt werden]]></item>
 		<item name="wcf.acp.label.group.list"><![CDATA[Labelgruppen]]></item>
+		<item name="wcf.acp.label.group.permanentSelection"><![CDATA[Die ausgewählte Labelgruppe kann nachträglich nicht mehr verändert werden.]]></item>
 		<item name="wcf.acp.label.label"><![CDATA[Label]]></item>
 		<item name="wcf.acp.label.list"><![CDATA[Labels]]></item>
 		<item name="wcf.acp.label.group.groupName.description"><![CDATA[Der Titel ist für alle Benutzer sichtbar, die Zugriff auf diese Labelgruppe haben.]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index eb6e2461cc..eff916b552 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -535,6 +535,7 @@ Examples for medium ID detection:
 		<item name="wcf.acp.label.group.error.notValid"><![CDATA[Chosen label group is invalid.]]></item>
 		<item name="wcf.acp.label.group.forceSelection"><![CDATA[Force selection of a label]]></item>
 		<item name="wcf.acp.label.group.list"><![CDATA[Label Groups]]></item>
+		<item name="wcf.acp.label.group.permanentSelection"><![CDATA[The selected label group cannot be modified and is permanent for this label.]]></item>
 		<item name="wcf.acp.label.label"><![CDATA[Label]]></item>
 		<item name="wcf.acp.label.list"><![CDATA[Labels]]></item>
 		<item name="wcf.acp.label.group.groupName.description"><![CDATA[The title is visible for every user who can interact with the label group.]]></item>