Allow to create objects again

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

diff --git a/gosa-plugins/fai/admin/fai/askClassName.tpl b/gosa-plugins/fai/admin/fai/askClassName.tpl
index 7c4329ae709e90d86f0eaa2da912c96dc4268314..e76465ad9c0fbbe88a731c96422ea66d824f8b2f 100644 (file)
--- a/gosa-plugins/fai/admin/fai/askClassName.tpl
+++ b/gosa-plugins/fai/admin/fai/askClassName.tpl
@@ -62,23 +62,13 @@
   </td>
  </tr>
 </table>
-
-<table summary="">
-       <tr>
-               <td>
-               <input type="submit" name="UseSelectedClass" value="{t}Use{/t}" {$ClassNamesAvailable}> 
-               </td>
-       </tr>
-       <tr>
-               <td><b>{t}A new class name.{/t}</b>
-               </td>
-               <td>
-               <input type="submit" name="UseNewClass" value="{t}Use{/t}"> 
-               </td>
-       </tr>
-</table>
 <p class="seperator">&nbsp;</p>
-       
+
+<p style="text-align:right">
+ <input type="submit" name="edit_continue" value="{t}Continue{/t}">&nbsp;
+ <input type="submit" name="edit_cancel" value="{msgPool type='cancelButton'}">
+</p>
+
 <!-- Place cursor -->
 <script language="JavaScript" type="text/javascript">
        <!--

diff --git a/gosa-plugins/fai/admin/fai/class_faiManagement.inc b/gosa-plugins/fai/admin/fai/class_faiManagement.inc
index 310f203288d0044d2947cf26ba8a278947dec563..9a9b232e8253083504e49dfc376594ca5adc842c 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiManagement.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiManagement.inc
@@ -94,6 +94,8 @@ class faiManagement extends management
     $this->registerAction("new_package","newEntry");
     $this->registerAction("new_partition","newEntry");
 
+    $this->registerAction("newClassNameSelected","newClassNameSelected");
+
     $this->registerAction("editByGroup","editByGroup");
     $this->registerAction("createBranch","createBranch");
     $this->registerAction("createFreeze","createFreeze");
@@ -171,14 +173,14 @@ class faiManagement extends management
       }
     }elseif(isset($this->dialogObject->objectClass)){
       $this->dn = "new" ;
-      $a_setup= $this->get_type(array("objectClass"=>array($this->dialogObject->objectClass)));
+      $type= $this->get_type(array("objectClass"=>array($this->dialogObject->objectClass)));
       $name = $this->dialogObject->save();
 
-      if(class_exists($a_setup[0])){
-        $this->tabObject = new $a_setup[0]($this->config,$this->config->data['TABS'][$a_setup[2]],$this->dn,"fai");
-        $this->tabObject->set_acl_base($this->base);
-        $this->tabObject->by_object[$a_setup[1]]->cn = $name;
-        $this->tabObject->parent = &$this;
+      if(class_exists($type[0])){
+        $this->closeDialogs();
+        management::newEntry('newEntry',array(),array(),$type[0],$type[2],$type[1]);
+        $this->tabObject->set_acl_base($this->acl_base);
+        $this->tabObject->by_object[$type[1]]->cn = $name;
       }
     }
   }
@@ -359,6 +361,9 @@ class faiManagement extends management
     if(isset($_POST['new_package'])) $action['action'] = "new_package";
     if(isset($_POST['new_partition'])) $action['action'] = "new_partition";
 
+    if(isset($_POST['edit_continue'])) $action['action'] = "newClassNameSelected";
+    if(isset($_POST['edit_cancel'])) $action['action'] = "cancel";
+
     if(isset($_POST['faiGroupHandle_cancel'])) $action['action'] = "cancel";
     if(isset($_POST['CancelBranchName'])) $action['action'] = "cancel";
     if(isset($_POST['delete_branch_confirm'])) $action['action'] = "removeBranchConfirmed";