Update ogroup managemnent

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

diff --git a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
index 3afbdf98d116734fc05ee3f188872fd2b5846287..8d329da116fcb03dbc9924b5a8d83bf04fc01679 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -40,33 +40,33 @@ class ogroupManagement extends management
 
     $this->storagePoints = array(get_ou("ogroupRDN"));
 
-#   // Build filter
-#   if (session::global_is_set(get_class($this)."_filter")){
-#     $filter= session::global_get(get_class($this)."_filter");
-#   } else {
-  $filter = new filter(get_template_path("ogroup-filter.xml", true));
-  $filter->setObjectStorage($this->storagePoints);
-#   }
-  $this->setFilter($filter);
+    // Build filter
+    if (session::global_is_set(get_class($this)."_filter")){
+      $filter= session::global_get(get_class($this)."_filter");
+    } else {
+      $filter = new filter(get_template_path("ogroup-filter.xml", true));
+      $filter->setObjectStorage($this->storagePoints);
+    }
+    $this->setFilter($filter);
 
-  // Build headpage
-  $headpage = new listing(get_template_path("ogroup-list.xml", true));
-  $headpage->registerElementFilter("filterProperties", "ogroupManagement::filterProperties");
-  $headpage->setFilter($filter);
+    // Build headpage
+    $headpage = new listing(get_template_path("ogroup-list.xml", true));
+    $headpage->registerElementFilter("filterProperties", "ogroupManagement::filterProperties");
+    $headpage->setFilter($filter);
 
-  // Add copy&paste and snapshot handler.
-  if ($this->config->boolValueIsTrue("main", "copyPaste")){
-    $this->cpHandler = new CopyPasteHandler($this->config);
-  }
-  if($this->config->get_cfg_value("enableSnapshots") == "true"){
-    $this->snapHandler = new SnapshotHandler($this->config);
-  }
-  parent::__construct($config, $ui, "ogroups", $headpage);
+    // Add copy&paste and snapshot handler.
+    if ($this->config->boolValueIsTrue("main", "copyPaste")){
+      $this->cpHandler = new CopyPasteHandler($this->config);
+    }
+    if($this->config->get_cfg_value("enableSnapshots") == "true"){
+      $this->snapHandler = new SnapshotHandler($this->config);
+    }
+    parent::__construct($config, $ui, "ogroups", $headpage);
 
-  $this->registerAction("edit_ogroup","editEntry");
-  $this->registerAction("edit_phonequeue","editEntry");
-  $this->registerAction("edit_workstartup","editEntry");
-  $this->registerAction("edit_termgroup","editEntry");
+    $this->registerAction("edit_ogroup","editEntry");
+    $this->registerAction("edit_phonequeue","editEntry");
+    $this->registerAction("edit_workstartup","editEntry");
+    $this->registerAction("edit_termgroup","editEntry");
   }
 
   function editEntry($action="",$target=array(),$all=array(), $altTabClass ="", $altTabType = "", $altAclCategory="")

diff --git a/gosa-core/plugins/admin/ogroups/remove.tpl b/gosa-core/plugins/admin/ogroups/remove.tpl
index 2b809b9b50ea5cb7b0f8c3491eac4fad4bcb6184..7735c280ec1e126e35c5b6247b10485a8754e936 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/remove.tpl
+++ b/gosa-core/plugins/admin/ogroups/remove.tpl
@@ -1,24 +1,17 @@
 <div style="font-size:18px;">
   <img alt="" src="images/warning.png" align=top>&nbsp;{t}Warning{/t}
 </div>
-
 <p>
   {$info}
-  {t}Please double check if you really want to do this since there is no way for GOsa to get your data back.{/t}
+  {t}This may be a primary user group. Please double check if you really want to do this since there is no way for GOsa to get your data back.{/t}
 </p>
+
 <p>
   {t}So - if you're sure - press 'Delete' to continue or 'Cancel' to abort.{/t}
 </p>
 
 <p class="plugbottom">
-       {if $multiple}
-               <input type=submit name="delete_multiple_ogroup_confirm" value="{msgPool type=delButton}">
-               &nbsp;
-               <input type=submit name="delete_multiple_ogroup_cancel" value="{msgPool type=cancelButton}">
-       {else}
-               <input type=submit name="delete_group_confirm" value="{msgPool type=delButton}">
-               &nbsp;
-               <input type=submit name="delete_cancel" value="{msgPool type=cancelButton}">
-       {/if}
+  <input type=submit name="delete_confirmed" value="{msgPool type=delButton}">
+  &nbsp;
+  <input type=submit name="delete_cancel" value="{msgPool type=cancelButton}">
 </p>
-