From: cajus Date: Fri, 22 Jan 2010 16:06:46 +0000 (+0000) Subject: Re-Enabled sorting X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4da9316a0d7d9a6ac25c9b1c09265b8dc12a382a;p=gosa.git Re-Enabled sorting git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15269 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/include/class_sortableListing.inc b/gosa-core/include/class_sortableListing.inc index 7d12f4878..b0539c202 100644 --- a/gosa-core/include/class_sortableListing.inc +++ b/gosa-core/include/class_sortableListing.inc @@ -327,6 +327,15 @@ class sortableListing { $this->sortData(); } } + } + + + public function save_object() + { + // Do not do anything if this is not our PID, or there's even no PID available... + if(!isset($_REQUEST['PID']) || $_REQUEST['PID'] != $this->id) { + return; + } // Do not do anything if we're not posted - or have no permission if (strpos($this->acl, 'w') !== false && isset($_POST['reorder_'.$this->id])){ diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc index 36dbd589a..062bccb04 100644 --- a/gosa-core/plugins/personal/generic/class_user.inc +++ b/gosa-core/plugins/personal/generic/class_user.inc @@ -261,6 +261,7 @@ class user extends plugin /* Set list ACL */ $this->gosaLoginRestrictionWidget->setAcl($this->getacl('gosaLoginRestriction', (!is_object($this->parent) && !session::is_set('edit')))); + $this->gosaLoginRestrictionWidget->update(); /* Handle add/delete for restriction mode */ if (isset($_POST['add_res']) && isset($_POST['res'])) { @@ -755,7 +756,7 @@ class user extends plugin plugin::save_object (); /* Sync lists */ - $this->gosaLoginRestrictionWidget->update(); + $this->gosaLoginRestrictionWidget->save_object(); if ($this->gosaLoginRestrictionWidget->isModified()) { $this->gosaLoginRestriction= $this->gosaLoginRestrictionWidget->getMaintainedData(); } diff --git a/gosa-core/plugins/personal/posix/class_posixAccount.inc b/gosa-core/plugins/personal/posix/class_posixAccount.inc index a3dbf1f1d..015c1af48 100644 --- a/gosa-core/plugins/personal/posix/class_posixAccount.inc +++ b/gosa-core/plugins/personal/posix/class_posixAccount.inc @@ -284,6 +284,7 @@ class posixAccount extends plugin /* Assign list acl */ $this->groupMembershipList->setAcl($this->getacl('memberUid', (!is_object($this->parent) && !session::is_set('edit')))); + $this->groupMembershipList->update(); /* Log view */ if($this->is_account && !$this->view_logged){ @@ -738,7 +739,7 @@ class posixAccount extends plugin plugin::save_object(); /* Maintain list */ - $this->groupMembershipList->update(); + $this->groupMembershipList->save_object(); /* Save force GID checkbox */ if($this->acl_is_writeable("gidNumber") || $this->acl_is_writeable("uidNumber")){