From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 16 Sep 2009 08:29:52 +0000 (+0000)
Subject: * Fix text strings
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e18855b19b04ddf9a6710c7ccd87ce7bf13cfaa2;p=gosa.git

* Fix text strings
* Re-enable base selection by ogroup like it was before. Closes #701


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

diff --git a/gosa-plugins/systems/admin/systems/class_systemManagement.inc b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
index bed0165bb..f60c5ce96 100644
--- a/gosa-plugins/systems/admin/systems/class_systemManagement.inc
+++ b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
@@ -385,10 +385,15 @@ class systems extends plugin
 
             /* We are allowed to create the requested system type */
             if(preg_match("/c/",$tabacl)){
-              $this->systab= new $tabclass($this->config, $this->config->data['TABS'][$class], $this->dn,$selected_system);
+              $this->systab= new $tabclass($this->config, $this->config->data['TABS'][$class], $this->dn, $selected_system);
               $this->systab->set_acl_base($this->DivListSystem->selectedBase);
-              $this->systab->by_object[$tabname]->base = $this->DivListSystem->selectedBase;
-              $this->systab->base = $this->DivListSystem->selectedBase;
+              if($selected_group != "none"){
+                $this->systab->base = preg_replace("/^[^,]+,".get_ou('ogroupRDN')."/", "", $selected_group);
+                $this->systab->by_object[$tabname]->base = $this->systab->base;
+              } else {
+                $this->systab->by_object[$tabname]->base = $this->DivListSystem->selectedBase;
+                $this->systab->base = $this->DivListSystem->selectedBase;
+              }
 
               /* This will be used when the object is saved, to set FAIstate to 'install'
                   and to preset maybe other attributes.
diff --git a/gosa-plugins/systems/admin/systems/component.tpl b/gosa-plugins/systems/admin/systems/component.tpl
index feb197da4..e9feb386d 100644
--- a/gosa-plugins/systems/admin/systems/component.tpl
+++ b/gosa-plugins/systems/admin/systems/component.tpl
@@ -17,7 +17,7 @@
 	  <td><LABEL for="base">{t}Base{/t}</LABEL>{$must}</td>
 	  <td>
 {render acl=$baseACL}
-	    <select id="base" size="1" name="base" title="{t}Choose subtree to place group in{/t}">
+	    <select id="base" size="1" name="base" title="{t}Choose subtree to place component in{/t}">
 	     {html_options options=$bases selected=$base_select}
 	    </select>
 {/render}
diff --git a/gosa-plugins/systems/admin/systems/server.tpl b/gosa-plugins/systems/admin/systems/server.tpl
index 38a634a18..c8224fcaa 100644
--- a/gosa-plugins/systems/admin/systems/server.tpl
+++ b/gosa-plugins/systems/admin/systems/server.tpl
@@ -23,7 +23,7 @@
 	  <td>
 	   <br>
 {render acl=$baseACL}
-      <select id="base" size="1" name="base" title="{t}Choose subtree to place group in{/t}">
+      <select id="base" size="1" name="base" title="{t}Choose subtree to place server in{/t}">
        {html_options options=$bases selected=$base_select}
       </select>
 {/render}