Fix #40 - deleting a group referenced by a user account restriction i…

…s now prohibited
tbar0970 · Sep 11, 2015 · 641bc4c · 641bc4c
1 parent b5d16fc
commit 641bc4c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/db_objects/person_group.class.php b/db_objects/person_group.class.php
@@ -288,11 +288,21 @@ function getInstancesQueryComps($params, $logic, $order)
 
 	function delete()
 	{
-		parent::delete();
+		$SQL = 'SELECT COUNT(*) FROM account_group_restriction WHERE groupid = '.(int)$this->id;
+		$res = $GLOBALS['db']->queryOne($SQL);
+		check_db_result($res);
+		if ($res > 0) {
+			add_message("This group cannot be deleted because it is used to restrict one or more user accounts", 'error');
+			return FALSE;
+		}
+
+		$r = parent::delete();
 		$db =& $GLOBALS['db'];
 		$sql = 'DELETE FROM person_group_membership WHERE groupid = '.$db->quote($this->id);
 		$res = $db->query($sql);
 		check_db_result($res);
+
+		return $r;
 	}
 
 	function printFieldValue($fieldname, $value=NULL)

diff --git a/views/view_0_edit_group.class.php b/views/view_0_edit_group.class.php
@@ -94,9 +94,12 @@ function _processObjectEditing()
 				if ($_POST['action'] == 'delete') { // must be POSTed
 					$GLOBALS['user_system']->checkPerm(PERM_EDITGROUP);
 					$name = $this->_edited_object->toString();
-					$this->_edited_object->delete();
-					add_message('Group "'.$name.'" deleted');
-					redirect('groups__list_all', Array('groupid' => NULL, 'action' => NULL)); // exits
+					if ($this->_edited_object->delete()) {
+						add_message('Group "'.$name.'" deleted');
+						redirect('groups__list_all', Array('groupid' => NULL, 'action' => NULL)); // exits
+					} else {
+						redirect('groups', Array('groupid' => $this->_edited_object->id));
+					}
 				}
 				break;
 		}