Fixed UnitTagging.

-Renaming of the ACLs caused Problems with the tagging.

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@12751 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 d0273c1e0e5421a9369e4dc807abd3ec9bfef8f7..04d0fd63cd8af6e6da5c3d769606e6d91e6f5bb2 100644 (file)
--- a/gosa-core/plugins/admin/departments/class_departmentGeneric.inc
+++ b/gosa-core/plugins/admin/departments/class_departmentGeneric.inc
@@ -254,7 +254,7 @@ class department extends plugin
 
       /* Save tagging flag */
       if ($this->acl_is_writeable("gosaUnitTag")){
-        if (isset($_POST['gosaUnitTag'])){
+        if (isset($_POST['is_administrational_unit'])){
           $this->is_administrational_unit= true;
         } else {
           $this->is_administrational_unit= false;

diff --git a/gosa-core/plugins/admin/departments/country.tpl b/gosa-core/plugins/admin/departments/country.tpl
index 7974f812d1ae25174331e8fbcbf4792e74c3974e..3164c3ed603dbb760dcbf7a3f05e3456dcbed1e8 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="gosaUnitTag" type=checkbox name="gosaUnitTag" value="1" {$gosaUnitTag}><label for="gosaUnitTag">{t}Tag department as an independent administrative unit{/t}</label>
+     <input id="is_administrational_unit" type=checkbox name="is_administrational_unit" value="1" {$gosaUnitTag}><label for="is_administrational_unit">{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 3994fbeb772d69510a09b43a01d17e99803f154a..6e985f04905971bf0bacf59db31b768dcd2a5535 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="gosaUnitTag" type=checkbox name="gosaUnitTag" value="1" {$gosaUnitTag}><label for="gosaUnitTag">{t}Tag department as an independent administrative unit{/t}</label>
+     <input id="is_administrational_unit" type=checkbox name="is_administrational_unit" value="1" {$gosaUnitTag}><label for="is_administrational_unit">{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 f99312fa13be6796c3e64ea66b1052b023a0768c..48f58dbc6cc0367555b691b79b06937f3ce40263 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="gosaUnitTag" type=checkbox name="gosaUnitTag" value="1" {$gosaUnitTag}><label for="gosaUnitTag">{t}Tag department as an independent administrative unit{/t}</label>
+     <input id="is_administrational_unit" type=checkbox name="is_administrational_unit" value="1" {$gosaUnitTag}><label for="is_administrational_unit">{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 eb330eacc393af8face9431f3e6d6cf8ffadeb54..3328695a6993e9a5d74cc85881aa867e7557ffaa 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="gosaUnitTag" type=checkbox name="gosaUnitTag" value="1" {$gosaUnitTag}><label for="gosaUnitTag">{t}Tag department as an independent administrative unit{/t}</label>
+     <input id="is_administrational_unit" type=checkbox name="is_administrational_unit" value="1" {$gosaUnitTag}><label for="is_administrational_unit">{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 028d1d22dc0f6b1ef60002ff1f182899b95b06e8..7a955f3f550066c95d1975b329f255796a5c428b 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="gosaUnitTag" type=checkbox name="gosaUnitTag" value="1" {$gosaUnitTag}><label for="gosaUnitTag">{t}Tag department as an independent administrative unit{/t}</label>
+     <input id="is_administrational_unit" type=checkbox name="is_administrational_unit" value="1" {$gosaUnitTag}><label for="is_administrational_unit">{t}Tag department as an independent administrative unit{/t}</label>
 {/render}
    </td>
   </tr>