Added uid proposal modification patch

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

diff --git a/gosa-core/include/class_core.inc b/gosa-core/include/class_core.inc
index 29ddf149f551914bdc5332b57d24b6fd5cba2b77..61e48653345a096f9c2d87e31dd42a9fc47dd2aa 100644 (file)
--- a/gosa-core/include/class_core.inc
+++ b/gosa-core/include/class_core.inc
@@ -496,7 +496,7 @@ class core extends plugin {
                                 "mandatory"     => FALSE),
 
                         array(
-                                "name"          => "allowModificationOfUid",
+                                "name"          => "allowUidProposalModification",
                                 "type"          => "bool",
                                 "default"       => "false",
                                 "description"   => _("Allows to modify uid-proposals when creating a new user from a user-template."),

diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc
index a16e1e20267d6d3fafe9da072faf59101133fe54..50aefa3eae2ee42f9c1ec3491f221d3e7d1c2490 100644 (file)
--- a/gosa-core/plugins/admin/users/class_userManagement.inc
+++ b/gosa-core/plugins/admin/users/class_userManagement.inc
@@ -481,7 +481,7 @@ class userManagement extends management
             $smarty->assign("template",  array_pop($target));
             $smarty->assign("templates", $templates);
             $smarty->assign("edit_uid", "");
-            $smarty->assign("allowModificationOfUid", $this->config->get_cfg_value("core","allowModificationOfUid"));
+            $smarty->assign("allowUidProposalModification", $this->config->get_cfg_value("core","allowUidProposalModification"));
             return($smarty->fetch(get_template_path('template.tpl', TRUE)));
 
             // -> See 'templateContinue' for further handling!
@@ -518,7 +518,7 @@ class userManagement extends management
             $smarty->assign("template", "none");
             $smarty->assign("templates", $templates);
             $smarty->assign("edit_uid", "");
-            $smarty->assign("allowModificationOfUid", $this->config->get_cfg_value("core","allowModificationOfUid"));
+            $smarty->assign("allowUidProposalModification", $this->config->get_cfg_value("core","allowUidProposalModification"));
             return($smarty->fetch(get_template_path('template.tpl', TRUE)));
 
             // -> See 'templateContinue' for further handling!
@@ -572,7 +572,7 @@ class userManagement extends management
             $smarty->assign("templates",$templates);
             $smarty->assign("got_uid", $this->got_uid);
             $smarty->assign("edit_uid",false);
-            $smarty->assign("allowModificationOfUid", $this->config->get_cfg_value("core","allowModificationOfUid"));
+            $smarty->assign("allowUidProposalModification", $this->config->get_cfg_value("core","allowUidProposalModification"));
             return($smarty->fetch(get_template_path('template.tpl', TRUE)));
         }
 
@@ -628,7 +628,7 @@ class userManagement extends management
                 $smarty->assign("template", get_post('template'));
             }
             $smarty->assign("templates",$templates); 
-            $smarty->assign("allowModificationOfUid", $this->config->get_cfg_value("core","allowModificationOfUid"));
+            $smarty->assign("allowUidProposalModification", $this->config->get_cfg_value("core","allowUidProposalModification"));
             return($smarty->fetch(get_template_path('template.tpl', TRUE)));
         }
 

diff --git a/gosa-core/plugins/admin/users/template.tpl b/gosa-core/plugins/admin/users/template.tpl
index a1b44392820516a723e8f5ca9961631ed9de0ca9..2f7e25dbbe0b6a1407ea2f2f391dcd4d8de754b0 100644 (file)
--- a/gosa-core/plugins/admin/users/template.tpl
+++ b/gosa-core/plugins/admin/users/template.tpl
@@ -32,7 +32,7 @@
     <td><b>{t}Login{/t}</b></td>
     <td>
       {if $edit_uid eq "false"}
-        {if $allowModificationOfUid == "true"}
+        {if $allowUidProposalModification == "true"}
            <select size="1" name="uidSelect" id='uidSelect' onChange="
                 document.getElementById('uid').value = document.getElementById('uidSelect').value;">
             {html_options output=$uids values=$uids selected=$uid}