diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc
index ebc120a7a5c408454e0f13dfc51fdfe08f9344ca..5862a766362b164337354791f4c54f3d43170208 100644 (file)
****************/
/* Finish button has been pressed */
- if ((isset($_POST['edit_finish'])) && (isset($this->ogroup->config)) ){
+ if ((isset($_POST['edit_finish']) || isset($_POST['edit_apply'])) && (isset($this->ogroup->config)) ){
/* Check tabs, will feed message array */
$message= $this->ogroup->check();
$this->ogroup->save();
gosa_log ("Object group'".$this->dn."' has been saved");
- /* Group has been saved successfully, remove lock from
- LDAP. */
- if ($this->dn != "new"){
- del_lock ($this->dn);
- }
-
- unset ($this->ogroup);
- $this->ogroup= NULL;
- unset ($_SESSION['objectinfo']);
+ if (!isset($_POST['edit_apply'])){
+ /* Group has been saved successfully, remove lock from
+ LDAP. */
+ if ($this->dn != "new"){
+ del_lock ($this->dn);
+ }
+ unset ($this->ogroup);
+ $this->ogroup= NULL;
+ unset ($_SESSION['objectinfo']);
+ }
} else {
/* Ok. There seem to be errors regarding to the tab data,
show message and continue as usual. */
/* Don't show buttons if tab dialog requests this */
if (!$this->ogroup->by_object[$this->ogroup->current]->dialog){
$display.= "<p style=\"text-align:right\">\n";
- $display.= "<input type=submit name=\"edit_finish\" value=\""._("Save")."\">\n";
+ $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
$display.= " \n";
+ if ($this->dn != "new"){
+ $display.= "<input type=submit name=\"edit_apply\" value=\""._("Apply")."\">\n";
+ $display.= " \n";
+ }
$display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
$display.= "</p>";
}
Display list
****************/
+ /* Check if there is a snapshot dialog open */
+ $base = $this->DivListOGroup->selectedBase;
+ if($str = $this->showSnapshotDialog($base,$this->get_used_snapshot_bases())){
+ return($str);
+ }
+
/* Display dialog with group list */
$this->DivListOGroup->parent = $this;
$this->DivListOGroup->execute();
}
+ /* Return departments, that will be included within snapshot detection */
+ function get_used_snapshot_bases()
+ {
+ return(array(get_people_ou().$this->DivListOGroup->selectedBase));
+ }
+
+
+
function convert_list($input)
{
$temp= "";