Fixed Problem with unitTag Acls.

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

diff --git a/gosa-core/plugins/admin/departments/class_departmentGeneric.inc b/gosa-core/plugins/admin/departments/class_departmentGeneric.inc
index d6cd8e31dfb8cd66e158e8fa94235268373129f9..e851984322288ea4f5b5a4a2355e27b20b6d345b 100644 (file)
--- a/gosa-core/plugins/admin/departments/class_departmentGeneric.inc
+++ b/gosa-core/plugins/admin/departments/class_departmentGeneric.inc
@@ -175,9 +175,9 @@ class department extends plugin
 
     /* Set admin unit flag */
     if ($this->is_administrational_unit) {
-      $smarty->assign("unitTag", "checked");
+      $smarty->assign("gosaUnitTag", "checked");
     } else {
-      $smarty->assign("unitTag", "");
+      $smarty->assign("gosaUnitTag", "");
     }
 
     $smarty->assign("dep_type",$this->type);
@@ -253,8 +253,8 @@ class department extends plugin
       }
 
       /* Save tagging flag */
-      if ($this->acl_is_writeable("unitTag")){
-        if (isset($_POST['unitTag'])){
+      if ($this->acl_is_writeable("gosaUnitTag")){
+        if (isset($_POST['gosaUnitTag'])){
           $this->is_administrational_unit= true;
         } else {
           $this->is_administrational_unit= false;
@@ -590,17 +590,18 @@ class department extends plugin
                   "plCategory"    => array("department" => array("objectClass" => "gosaDepartment", "description" => _("Departments"))),
             
                   "plProvidedAcls" => array(
-                    "description"       => _("Description"),
-                    "c"                 => _("Country"),
-                    "base"              => _("Base"),
-                    "l"                 => _("Location"),
-                    "telephoneNumber"   => _("Telephone"),
                     "ou"                => _("Department name"),
+                    "description"       => _("Description"),
                     "businessCategory"  => _("Category"),
+                    "base"              => _("Base"),
+
                     "st"                => _("State"),
+                    "l"                 => _("Location"),
                     "postalAddress"     => _("Address"),
-                    "gosaUnitTag"       => _("Administrative settings"),
-                    "facsimileTelephoneNumber" => _("Fax"))
+                    "telephoneNumber"   => _("Telephone"),
+                    "facsimileTelephoneNumber" => _("Fax"),
+
+                    "gosaUnitTag"       => _("Administrative settings"))
                   ));
   }
 

diff --git a/gosa-core/plugins/admin/departments/country.tpl b/gosa-core/plugins/admin/departments/country.tpl
index ca2d4992696970d068df1099f7b05532c384b00d..7974f812d1ae25174331e8fbcbf4792e74c3974e 100644 (file)
--- a/gosa-core/plugins/admin/departments/country.tpl
+++ b/gosa-core/plugins/admin/departments/country.tpl
@@ -49,7 +49,7 @@
    <td style="vertical-align:top; width:100%">
      <h2><img class="center" alt="" align="middle" src="images/lists/locked.png"> {t}Administrative settings{/t}</h2>
 {render acl=$gosaUnitTagACL}
-     <input id="unitTag" type=checkbox name="unitTag" value="1" {$unitTag}><label for="unitTag">{t}Tag department as an independent administrative unit{/t}</label>
+     <input id="gosaUnitTag" type=checkbox name="gosaUnitTag" value="1" {$gosaUnitTag}><label for="gosaUnitTag">{t}Tag department as an independent administrative unit{/t}</label>
 {/render}
    </td>
   </tr>

diff --git a/gosa-core/plugins/admin/departments/dcObject.tpl b/gosa-core/plugins/admin/departments/dcObject.tpl
index 70b9a1d904dfa60ab9c6a02bf0713ef28ff3c815..3994fbeb772d69510a09b43a01d17e99803f154a 100644 (file)
--- a/gosa-core/plugins/admin/departments/dcObject.tpl
+++ b/gosa-core/plugins/admin/departments/dcObject.tpl
@@ -49,7 +49,7 @@
    <td style="vertical-align:top; width:100%">
      <h2><img class="center" alt="" align="middle" src="images/lists/locked.png"> {t}Administrative settings{/t}</h2>
 {render acl=$gosaUnitTagACL}
-     <input id="unitTag" type=checkbox name="unitTag" value="1" {$unitTag}><label for="unitTag">{t}Tag department as an independent administrative unit{/t}</label>
+     <input id="gosaUnitTag" type=checkbox name="gosaUnitTag" value="1" {$gosaUnitTag}><label for="gosaUnitTag">{t}Tag department as an independent administrative unit{/t}</label>
 {/render}
    </td>
   </tr>

diff --git a/gosa-core/plugins/admin/departments/generic.tpl b/gosa-core/plugins/admin/departments/generic.tpl
index 5a90e01f28ddaa433264df8328baa4cd9952822a..f99312fa13be6796c3e64ea66b1052b023a0768c 100644 (file)
--- a/gosa-core/plugins/admin/departments/generic.tpl
+++ b/gosa-core/plugins/admin/departments/generic.tpl
@@ -113,7 +113,7 @@
    <td style="vertical-align:top; width:100%">
      <h2><img class="center" alt="" align="middle" src="images/lists/locked.png"> {t}Administrative settings{/t}</h2>
 {render acl=$gosaUnitTagACL}
-     <input id="unitTag" type=checkbox name="unitTag" value="1" {$unitTag}><label for="unitTag">{t}Tag department as an independent administrative unit{/t}</label>
+     <input id="gosaUnitTag" type=checkbox name="gosaUnitTag" value="1" {$gosaUnitTag}><label for="gosaUnitTag">{t}Tag department as an independent administrative unit{/t}</label>
 {/render}
    </td>
   </tr>

diff --git a/gosa-core/plugins/admin/departments/locality.tpl b/gosa-core/plugins/admin/departments/locality.tpl
index 62a3816e5e63c2d33d3e05e610674484968cdee6..eb330eacc393af8face9431f3e6d6cf8ffadeb54 100644 (file)
--- a/gosa-core/plugins/admin/departments/locality.tpl
+++ b/gosa-core/plugins/admin/departments/locality.tpl
@@ -49,7 +49,7 @@
    <td style="vertical-align:top; width:100%">
      <h2><img class="center" alt="" align="middle" src="images/lists/locked.png"> {t}Administrative settings{/t}</h2>
 {render acl=$gosaUnitTagACL}
-     <input id="unitTag" type=checkbox name="unitTag" value="1" {$unitTag}><label for="unitTag">{t}Tag department as an independent administrative unit{/t}</label>
+     <input id="gosaUnitTag" type=checkbox name="gosaUnitTag" value="1" {$gosaUnitTag}><label for="gosaUnitTag">{t}Tag department as an independent administrative unit{/t}</label>
 {/render}
    </td>
   </tr>

diff --git a/gosa-core/plugins/admin/departments/organization.tpl b/gosa-core/plugins/admin/departments/organization.tpl
index 88a761214b09482d9d7c7d61d20b6eefd081f0b7..028d1d22dc0f6b1ef60002ff1f182899b95b06e8 100644 (file)
--- a/gosa-core/plugins/admin/departments/organization.tpl
+++ b/gosa-core/plugins/admin/departments/organization.tpl
@@ -113,7 +113,7 @@
    <td style="vertical-align:top; width:100%">
      <h2><img class="center" alt="" align="middle" src="images/lists/locked.png"> {t}Administrative settings{/t}</h2>
 {render acl=$gosaUnitTagACL}
-     <input id="unitTag" type=checkbox name="unitTag" value="1" {$unitTag}><label for="unitTag">{t}Tag department as an independent administrative unit{/t}</label>
+     <input id="gosaUnitTag" type=checkbox name="gosaUnitTag" value="1" {$gosaUnitTag}><label for="gosaUnitTag">{t}Tag department as an independent administrative unit{/t}</label>
 {/render}
    </td>
   </tr>