Updated departments

-Added ACL info to each dep type.

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

diff --git a/gosa-core/plugins/admin/departments/class_countryGeneric.inc b/gosa-core/plugins/admin/departments/class_countryGeneric.inc
index d44f72e682f4434a05a06b66fc301937c27f4255..0e29a7ad5b3e7e3e8125053da823f41c5f7edee9 100644 (file)
--- a/gosa-core/plugins/admin/departments/class_countryGeneric.inc
+++ b/gosa-core/plugins/admin/departments/class_countryGeneric.inc
@@ -37,6 +37,28 @@ class country extends department
     return($message);
   }
 
+
+  /* Return plugin informations for acl handling */ 
+  static function plInfo()
+  {
+    return (array("plShortName"   => _("Country"),
+          "plDescription" => _("Country"),
+          "plSelfModify"  => FALSE,
+          "plPriority"    => 2,
+          "plDepends"     => array(),
+          "plSection"     => array("admin"),
+          "plCategory"    => array("department"),
+
+          "plProvidedAcls" => array(
+#            "searchGuide"                => _("Search guide"),
+#            "seeAlso"                    => _("See also"),
+            "street"            => _("Street"),
+            "base"              => _("Base"),
+            "gosaUnitTag"       => _("Administrative settings"),
+            "description"       => _("Description"),
+            "c"                 => _("Country name")),
+          ));
+  }
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:

diff --git a/gosa-core/plugins/admin/departments/class_localityGeneric.inc b/gosa-core/plugins/admin/departments/class_localityGeneric.inc
index b0c009018f489e647344df5c03410667dd089122..2944748cff256e76ecf7e60c2bc57ad4aa737016 100644 (file)
--- a/gosa-core/plugins/admin/departments/class_localityGeneric.inc
+++ b/gosa-core/plugins/admin/departments/class_localityGeneric.inc
@@ -23,12 +23,13 @@
 class locality extends department
 {
        /* attribute list for save action */
-       var $attributes     = array( "l", "description");
+       var $attributes     = array("l", "description");
        var $objectclasses  = array("top", "locality");
-  var $type   ="l";
-  var $l      ="";
-  var $orgi_l ="";
 
+  var $description= "";
+  var $type       = "l";
+  var $l          = "";
+  var $orig_l     = "";
   var $namingAttr = "l";
 
   function check()
@@ -37,6 +38,30 @@ class locality extends department
     return($message);
   }
 
+
+  /* Return plugin informations for acl handling */ 
+  static function plInfo()
+  {
+    return (array("plShortName"   => _("Locality"),
+          "plDescription" => _("Locality"),
+          "plSelfModify"  => FALSE,
+          "plPriority"    => 3,
+          "plDepends"     => array(),
+          "plSection"     => array("admin"),
+          "plCategory"    => array("department"),
+
+          "plProvidedAcls" => array(
+
+      
+
+            "description"       => _("Description"),
+            "l"                 => _("Location"),
+            "st"                => _("State"),
+
+            "base"              => _("Base"),
+            "gosaUnitTag"       => _("Administrative settings")),
+          ));
+  }
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:

diff --git a/gosa-core/plugins/admin/departments/class_organizationGeneric.inc b/gosa-core/plugins/admin/departments/class_organizationGeneric.inc
index 5a1219c2a885d89f6a1f38a9e44392680a252e91..f6f4c90971db769d48f4bc6edcbe8b961ceb0784 100644 (file)
--- a/gosa-core/plugins/admin/departments/class_organizationGeneric.inc
+++ b/gosa-core/plugins/admin/departments/class_organizationGeneric.inc
@@ -76,7 +76,7 @@ class organization extends department
     return (array("plShortName"   => _("Organization"),
           "plDescription" => _("Organization"),
           "plSelfModify"  => FALSE,
-          "plPriority"    => 0,
+          "plPriority"    => 1,
           "plDepends"     => array(),
           "plSection"     => array("admin"),
           "plCategory"    => array("department"),

diff --git a/gosa-core/plugins/admin/departments/country.tpl b/gosa-core/plugins/admin/departments/country.tpl
index 437a1c2a63afbaa52ef8373d38abd94f2d07b69e..c2ad34b2dd6a969d363baeb0775ece27ae001890 100644 (file)
--- a/gosa-core/plugins/admin/departments/country.tpl
+++ b/gosa-core/plugins/admin/departments/country.tpl
@@ -10,7 +10,7 @@
       <tr>
        <td><LABEL for="c">{t}Country name{/t}</LABEL>{$must}</td>
        <td>
-{render acl=$ouACL}
+{render acl=$cACL}
        <input id="c" name="c" size=25 maxlength=60 value="{$c}" title="{t}Name of country to create{/t}">
 {/render}
        </td>
@@ -52,3 +52,4 @@
    </td>
   </tr>
 </table>
+<input type='hidden' name='dep_generic_posted' value='1'>

diff --git a/gosa-core/plugins/admin/departments/locality.tpl b/gosa-core/plugins/admin/departments/locality.tpl
index 10c929013dca297243ac0e8ec633e2ec34962219..8a1f46e3f86e9df9fecf33bc041fe1889c14b84a 100644 (file)
--- a/gosa-core/plugins/admin/departments/locality.tpl
+++ b/gosa-core/plugins/admin/departments/locality.tpl
@@ -10,7 +10,7 @@
       <tr>
        <td><LABEL for="l">{t}Locality name{/t}</LABEL>{$must}</td>
        <td>
-{render acl=$ouACL}
+{render acl=$lACL}
        <input id="l" name="l" size=25 maxlength=60 value="{$l}" title="{t}Name of locality to create{/t}">
 {/render}
        </td>
@@ -52,3 +52,4 @@
    </td>
   </tr>
 </table>
+<input type='hidden' name='dep_generic_posted' value='1'>

diff --git a/gosa-core/plugins/admin/departments/organization.tpl b/gosa-core/plugins/admin/departments/organization.tpl
index 26ddc581c95c4cb4127c19c80e7cbb415a5b71cf..69fb3c1e5dfa9e77eebc7d76e6d76f33e8b462be 100644 (file)
--- a/gosa-core/plugins/admin/departments/organization.tpl
+++ b/gosa-core/plugins/admin/departments/organization.tpl
@@ -124,3 +124,4 @@
        focus_field('o');
   -->
 </script>
+<input type='hidden' name='dep_generic_posted' value='1'>