Remove applications for release if release is removed

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

diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc
index 730501ea5cd23885a451ba7a983c83f52b78c9ee..98b4ec3cc5fc0acd305da9ba9263cb6901408080 100644 (file)
--- a/plugins/admin/fai/class_faiManagement.inc
+++ b/plugins/admin/fai/class_faiManagement.inc
@@ -344,10 +344,11 @@ class faiManagement extends plugin
 
         $ldap->cd($bb);
         $ldap->recursive_remove();
+        $ldap->cd(preg_replace('/,ou=fai,ou=configs,ou=systems,/', ',ou=apps,', $bb));
+        $ldap->recursive_remove();
         $faifilter['branch'] = "main";
 
         /* Post remove */
-                
         //  $this->lock_type is set from this->reload
         $this->lock_name   = $name;
         $this->lock_dn     = $bb;

diff --git a/plugins/admin/fai/headpage.tpl b/plugins/admin/fai/headpage.tpl
index 6676b0d9843a4e3c739b7a068c2c01efcac2ef7c..6a4e562c186f92c4a273cf16156713d7696c3668 100644 (file)
--- a/plugins/admin/fai/headpage.tpl
+++ b/plugins/admin/fai/headpage.tpl
@@ -44,11 +44,11 @@
          <td>
        <input type="image" align="middle" value="branch" name="branch_branch" src="images/branch_small.png">
        &nbsp;
-       {t}Create new branch using the current release{/t}
+       {t}Create new branch{/t}
        <br>
        <input type="image" align="middle" value="freeze" name="freeze_branch" src="images/closedlock.png">
        &nbsp;
-       {t}Create a locked version of the current release{/t}
+       {t}Create new locked branch{/t}
        {if $select_branch != "main"}
        <br>
        <input type="image" align="middle" value="delete" name="remove_branch" src="images/edittrash.png">