Fixed queue remove and added member warning

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5513 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc
index 013fd65561d0d26896308161063b33ce65c568b6..82c47d2fa61869b7288c466c5cfeb238e4811732 100644 (file)
--- a/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -177,7 +177,6 @@ class ogroupManagement extends plugin
         /* Delete request is permitted, perform LDAP action */
         $this->ogroup= new ogrouptabs($this->config,
             $this->config->data['TABS']['OGROUPTABS'], $this->dn);
-        $this->ogroup->set_acl(array($this->acl));
         $this->ogroup->delete ();
         gosa_log ("Object group'".$this->dn."' has been removed");
         unset ($this->ogroup);

diff --git a/plugins/admin/ogroups/phonequeue.tpl b/plugins/admin/ogroups/phonequeue.tpl
index 53fbb20edf02f7cdf006a3899c39b440701b9f1f..643b4a32653850dff09ec20283ed4bd2d9021eac 100644 (file)
--- a/plugins/admin/ogroups/phonequeue.tpl
+++ b/plugins/admin/ogroups/phonequeue.tpl
@@ -1,3 +1,7 @@
+<p style='padding-left:7px;'>
+ <img class='center' src='images/lamp.png' alt='!'>&nbsp;<b>{t}Only users with the same asterisk home server will be included to this queue.{/t}</b>
+</p>
+
 <table summary="{t}Queue Settings{/t}" style="width: 100%; vertical-align: top; text-align: left;" border="0" cellpadding="4">
 <tr>
 <td valign='top'>
@@ -268,7 +272,7 @@
         <tr>
         <td colspan=2>
 {render acl=$goFonQueueAnnounceHoldtimeACL}
-            <input type="checkbox" name='goFonQueueAnnounceHoldtime' value='yes'  {$goFonQueueAnnounceHoldtimeCHK}{$goFonQueueAnnounceHoldtimeACL}>
+            <input type="checkbox" name='goFonQueueAnnounceHoldtime' value='yes'  {$goFonQueueAnnounceHoldtimeCHK}>
 {/render}
             {t}Announce holdtime{/t}
         </td>