Fixed Package & Profile acls

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

diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc
index 1afeec431923d07042d9aac0e62728c25d08d383..68078e36a92ad254f57880616f6af4cac911112c 100644 (file)
--- a/plugins/admin/fai/class_faiManagement.inc
+++ b/plugins/admin/fai/class_faiManagement.inc
@@ -514,7 +514,7 @@ class faiManagement extends plugin
       $acl = $this->ui->get_permissions($this->DivListFai->selectedBase,"fai/faiProfile");
       if(preg_match("/c/",$acl)){
         $a_setup= $this->get_type(array("objectClass"=>array("FAIprofile")));
-        $this->dialog = new $a_setup[0]($this->config,$this->config->data['TABS'][$a_setup[2]],$this->dn,"faiProfile");
+        $this->dialog = new $a_setup[0]($this->config,$this->config->data['TABS'][$a_setup[2]],$this->dn,"fai");
         $this->dialog->set_acl_base($_SESSION['CurrentMainBase']);
 
         $this->is_dialog = false;

diff --git a/plugins/admin/fai/class_faiPackage.inc b/plugins/admin/fai/class_faiPackage.inc
index bb06019cd064a4d132405ccef8579f9b525b5367..088c3c04b60457cd54cc240b3af84dd5f68d41b2 100644 (file)
--- a/plugins/admin/fai/class_faiPackage.inc
+++ b/plugins/admin/fai/class_faiPackage.inc
@@ -529,17 +529,17 @@ class faiPackage extends plugin
           "plDescription" => _("FAI Package list"),
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 30,
+          "plPriority"    => 28,
           "plSection"     => array("administration"),
           "plCategory"    => array("fai"),
           "plProvidedAcls" => array(
             "cn"                => _("Name"),
             "description"       => _("Description"),
             "FAIpackage"        => _("Packages"),
-            "FAIdebianSection"  => _("Section"),
+            "FAIdebianSection"  => _("Section")." ("._("Readonly").")",
             "FAIinstallMethod"  => _("Install Method"),
             "FAIdebconfInfo"    => _("Package configuration"),
-            "FAIdebianRelease"  => _("Release"))
+            "FAIdebianRelease"  => _("Release")." ("._("Readonly").")")
           ));
   }
 }

diff --git a/plugins/admin/fai/class_faiProfile.inc b/plugins/admin/fai/class_faiProfile.inc
index a4ae413562f04e0afe9b4f7bc8378870cb8e5b3e..568d120f2b3e55c9da471de7ae8284cba3cc6a43 100644 (file)
--- a/plugins/admin/fai/class_faiProfile.inc
+++ b/plugins/admin/fai/class_faiProfile.inc
@@ -444,7 +444,7 @@ class faiProfile extends plugin
           "plDescription" => _("FAI profile"),
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 28,
+          "plPriority"    => 30,
           "plSection"     => array("administration"),
           "plCategory"    => array("fai"),
           "plProvidedAcls" => array(

diff --git a/plugins/admin/fai/faiPackage.tpl b/plugins/admin/fai/faiPackage.tpl
index 1dfd31983df2ea27196188a7e1a4622044e0eb4e..4986d856afbf8e221547086e43adb8a1377aa291 100644 (file)
--- a/plugins/admin/fai/faiPackage.tpl
+++ b/plugins/admin/fai/faiPackage.tpl
@@ -74,10 +74,18 @@
                                {html_options options=$usedPackages}
                </select>
                        <br>
-                       <input type="submit" name="Addpkg" value="{t}Add{/t}" {$FAIpackageACL}>
-                       <input type="submit" name="Delpkg" value="{t}Remove{/t}"  {$FAIpackageACL}>
-                       <input type="submit" name="Conpkg" value="{t}Configure{/t}"  {$FAIdebconfInfoACL} >
-                       <input type="submit" name="Markpkg" value="{t}Toggle remove flag{/t}"  {$FAIpackageACL}>
+{render acl=$FAIpackageACL}
+                       <input type="submit" name="Addpkg" value="{t}Add{/t}">
+{/render}
+{render acl=$FAIpackageACL}
+                       <input type="submit" name="Delpkg" value="{t}Remove{/t}">
+{/render}
+{render acl=$FAIdebconfInfoACL}
+                       <input type="submit" name="Conpkg" value="{t}Configure{/t}">
+{/render}
+{render acl=$FAIpackageACL}
+                       <input type="submit" name="Markpkg" value="{t}Toggle remove flag{/t}">
+{/render}
                </td>
        </tr>
 </table>