From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 26 Jan 2012 15:17:36 +0000 (+0100)
Subject: Fixed deletion of user groups
X-Git-Tag: 2.0.0_Beta_1~1388^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d50205ff8735e506ad5eff97bab462a7a0314c89;p=GitHub%2FWoltLab%2FWCF.git

Fixed deletion of user groups
---

diff --git a/wcfsetup/install/files/acp/templates/userGroupList.tpl b/wcfsetup/install/files/acp/templates/userGroupList.tpl
index ee9bcb913d..1b7585b76c 100644
--- a/wcfsetup/install/files/acp/templates/userGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupList.tpl
@@ -1,5 +1,13 @@
 {include file='header'}
 
+<script type="text/javascript">
+	//<![CDATA[
+	$(function() {
+		new WCF.Action.Delete('wcf\\data\\user\\group\\UserGroupAction', $('.userGroupRow'));
+	});
+	//]]>
+</script>
+
 <header class="mainHeading">
 	<img src="{@RELATIVE_WCF_DIR}icon/users1.svg" alt="" />
 	<hgroup>
@@ -11,7 +19,7 @@
 	{pages print=true assign=pagesLinks controller="UserGroupList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
 	<nav>
 		<ul class="largeButtons">
-			<li><a href="{link controller='UserGroupAdd'}{/link}" title="{lang}wcf.acp.group.add{/lang}" class="button"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
+			<li><a href="{link controller='UserGroupAdd'}{/link}" title="{lang}wcf.acp.group.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
 			
 			{event name='largeButtons'}
 		</ul>
@@ -38,7 +46,7 @@
 			<tbody>
 				{content}
 					{foreach from=$objects item=group}
-						<tr id="groupContainer{@$group->groupID}">
+						<tr id="groupContainer{@$group->groupID}" class="userGroupRow">
 							<td class="columnIcon">
 								{if $group->isEditable()}
 									<a href="{link controller='UserGroupEdit' id=$group->groupID}{/link}"><img src="{@RELATIVE_WCF_DIR}icon/edit1.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="balloonTooltip" /></a>
@@ -70,7 +78,7 @@
 		{@$pagesLinks}
 		<nav>
 			<ul class="largeButtons">
-				<li><a href="{link controller='UserGroupAdd'}{/link}" title="{lang}wcf.acp.group.add{/lang}" class="button"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
+				<li><a href="{link controller='UserGroupAdd'}{/link}" title="{lang}wcf.acp.group.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
 				
 				{event name='largeButtons'}
 			</ul>
diff --git a/wcfsetup/install/files/lib/data/user/group/UserGroupEditor.class.php b/wcfsetup/install/files/lib/data/user/group/UserGroupEditor.class.php
index 90c8fb0505..a56b6b06f6 100644
--- a/wcfsetup/install/files/lib/data/user/group/UserGroupEditor.class.php
+++ b/wcfsetup/install/files/lib/data/user/group/UserGroupEditor.class.php
@@ -117,15 +117,15 @@ class UserGroupEditor extends DatabaseObjectEditor implements IEditableCachedObj
 	 */
 	protected static function updateAccessibleGroups($groupID, $delete = false) {
 		if ($delete) {
-			$sql = "UPDATE	wcf".WCF_N."_group_option_value
+			$sql = "UPDATE	wcf".WCF_N."_user_group_option_value
 					SET	optionValue = ?
 					WHERE	groupID = ?
 					AND	optionID = ?";
 			$updateStatement = WCF::getDB()->prepareStatement($sql);
 			
 			$sql = "SELECT		groupID, optionValue, groupOption.optionID
-				FROM		wcf".WCF_N."_group_option groupOption
-				LEFT JOIN	wcf".WCF_N."_group_option_value optionValue
+				FROM		wcf".WCF_N."_user_group_option groupOption
+				LEFT JOIN	wcf".WCF_N."_user_group_option_value optionValue
 				ON		(groupOption.optionID = optionValue.optionID)
 				WHERE		groupOption.optionname = ?";
 			$statement = WCF::getDB()->prepareStatement($sql);