diff --git a/plugins/gofon/conference/class_phoneConferenceManagment.inc b/plugins/gofon/conference/class_phoneConferenceManagment.inc
index 9444cccce279349252e24fb65158ed50494e8ead..f2b093910e4d6ac414e582a78a267f41aa9bf4f2 100644 (file)
***************/
/* Edit finished, check and save changes */
- if ((isset($_POST['edit_finish'])) && (isset($this->conftab->config))){
+ if ((isset($_POST['edit_finish']) || isset($_POST['edit_apply'])) && (isset($this->conftab->config))){
/* Check tabs, will feed message array */
$this->conftab->last= $this->conftab->current;
$this->conftab->save_object();
}
gosa_log ("goFonConference object '".$this->dn."' has been saved");
- if ($this->dn != "new"){
- del_lock ($this->dn);
+ if (!isset($_POST['edit_apply'])){
+ if ($this->dn != "new"){
+ del_lock ($this->dn);
+ }
}
$this->conftab->save ();
/* Don't show buttons if tab dialog requests this */
if (!$this->conftab->by_object[$this->conftab->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 divlist
***************/
+ /* Check if there is a snapshot dialog open */
+ if($str = $this->showSnapshotDialog($this->DivListConference->selectedBase,
+ array("ou=conferences,ou=asterisk,ou=configs,ou=systems,".$this->DivListConference->selectedBase))){
+ return($str);
+ }
+
/* Return rendered main page */
/* Display dialog with system list */
+ $this->DivListConference->parent = $this;
$this->DivListConference->execute();
/* Add departments if subsearch is disabled */
*/
function reload()
{
- $Base = $this->DivListConference->selectedBase;
+ $Base = "ou=conferences,ou=asterisk,ou=configs,ou=systems,".$this->DivListConference->selectedBase;
$SubSearch = $this->DivListConference->SubSearch;
$Regex = $this->DivListConference->Regex;
$Flags = GL_SIZELIMIT ;