* 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 bed0165bbf0434547a6013e434f618934456f436..f60c5ce96f2b241097b2da4b42ed8162a6d25468 100644 (file)
--- 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 feb197da4da7b45687e63d73d35b2a54b816362a..e9feb386d6dffdb71c90549edb80a271068a3785 100644 (file)
--- 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 38a634a18ad9783cb6a40162c0d2c597bed4de29..c8224fcaaa9850391fac0c7dfc08a6eedc1270af 100644 (file)
--- 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}