Mailinglist Archive: yast-commit (650 mails)

[kmachalkova@xxxxxxxxxxxxxxxx]

Author: kmachalkova
Date: Thu Feb 26 10:27:11 2009
New Revision: 55778

URL: http://svn.opensuse.org/viewcvs/yast?rev=55778&view=rev
Log:
The same thing for RunAs aliases (#421053)

Modified:
    trunk/sudo/src/dialog-runas.ycp
    trunk/sudo/src/dialog-user.ycp

Modified: trunk/sudo/src/dialog-runas.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialog-runas.ycp?rev=55778&r1=55777&r2=55778&view=diff
==============================================================================
--- trunk/sudo/src/dialog-runas.ycp (original)
+++ trunk/sudo/src/dialog-runas.ycp Thu Feb 26 10:27:11 2009
@@ -9,13 +9,9 @@
 include "sudo/complex.ycp";
 include "sudo/helps.ycp";
 
-any RedrawRunAsAlias(string name, list <string> members, list <string> users) {
+void RedrawRunAsAlias( list <string> members ) {
        list <term> items = [];
 
-       if (name != "") {
-               UI::ChangeWidget(`id("runas_alias_name"), `Value, name);
-       }
-
        foreach(string it, members, {
                items = add(items, `item(`id(it),it));
        });
@@ -23,9 +19,6 @@
        UI::ChangeWidget(`id("runas_alias_members"),`Items, items);
        UI::ChangeWidget(`id("remove_member"), `Enabled, (items != []));
 
-       UI::ReplaceWidget(`id("all_run_as_replace"),
-               `ComboBox(`id("all_run_as"),_("Local and System 
Users"),sort(string s, string t, users, ``( s < t))));
-
 }
 
 any AddEditRunAsAliasDialog (string what) {
@@ -50,33 +43,25 @@
        }
 
        term contents = `VBox (
-               `TextEntry(`id("runas_alias_name"),_("Alias Name (in 
CAPITALS)")),
+               `Left(`InputField(`id("runas_alias_name"),_("Alias Name (in 
CAPITALS)"))),
                `VSpacing(1),
-               `HBox(
-                       `VBox(
-                               `opt(`hstretch),
-                               `Left(`ReplacePoint(`id("all_run_as_replace"),
-                                       `ComboBox(`id("all_run_as"),_("Local 
and System Users"), [])
-                               )),
-                               `Table(`id("runas_alias_members"), 
`opt(`hstretch,`vstretch), `header(_("Alias Members")),[])
-                       ),
-                       `HSquash(
-                               `VBox (
-                                       `VSpacing(1.1),
-                        `PushButton ( `id ( "add_member" ), `opt ( `hstretch, 
`key_F3), " " + Label::AddButton() + " "),
-                        `PushButton ( `id ( "remove_member" ), `opt ( 
`hstretch , `key_F5), " " + Label::DeleteButton() + " "),
-                        `Empty(`opt(`vstretch))
+               `VBox(
+                   `Table(`id("runas_alias_members"), 
`opt(`hstretch,`vstretch), `header(_("Alias Members")),[]),
+                   `HBox(
+                        `PushButton ( `id ( "add_member" ), `opt ( `key_F3), " 
" + Label::AddButton() + " "),
+                        `PushButton ( `id ( "remove_member" ), `opt (  
`key_F5), " " + Label::DeleteButton() + " "),
+                        `HStretch()
                     )
-               )
+                 )
 
-               )
-       );
+           );
 
        Wizard::SetContentsButtons(caption, 
contents,HELPS["runas_alias"]:"",Label::CancelButton(), Label::OKButton());
        Wizard::HideAbortButton();
        UI::ChangeWidget (`id("runas_alias_name"), `ValidChars, 
"_0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ");
+       UI::ChangeWidget (`id("runas_alias_name"), `Value, name);
 
-       RedrawRunAsAlias(name, alias_members,users);
+       RedrawRunAsAlias(alias_members);
 
        any ret = nil;
        while(true) {
@@ -109,23 +94,24 @@
                Sudo::SetModified();
                break;
                /* back */
-            }else if(ret == `back) {
+           }else if(ret == `back) {
                break;
                /* add users*/
-               }else if(ret == "add_member"){
-                       string new_member = (string) 
UI::QueryWidget(`id("all_run_as"),`Value);
+           } else if(ret == "add_member"){
+               string new_member = AddUserDialog( users );
 
-                       alias_members = add(alias_members, new_member);
-                       users = filter(string s, users, ``(s != new_member));
-                       RedrawRunAsAlias("",alias_members, users);
+               if (new_member != "")
+               {
+                   alias_members = add(alias_members, new_member);
+                   users = filter(string s, users, ``(s != new_member));
+                   RedrawRunAsAlias(alias_members);
+               }
                /* delete users */
-               }else if (ret == "remove_member"){
-                       string current_item = (string) 
UI::QueryWidget(`id("runas_alias_members"), `CurrentItem);
-                       alias_members = filter(string s, alias_members, ``(s != 
current_item));
-                       users = add(users, current_item);
-                       UI::ReplaceWidget(`id("all_run_as_replace"),
-                               `ComboBox(`id("all_run_as"),_("Local and System 
Users"),users));
-                       RedrawRunAsAlias("",alias_members, users);
+           } else if (ret == "remove_member"){
+               string current_item = (string) 
UI::QueryWidget(`id("runas_alias_members"), `CurrentItem);
+               alias_members = filter(string s, alias_members, ``(s != 
current_item));
+               users = add(users, current_item);
+               RedrawRunAsAlias(alias_members);
            /* unknown */
            } else {
                y2error("unexpected retcode: %1", ret);

Modified: trunk/sudo/src/dialog-user.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialog-user.ycp?rev=55778&r1=55777&r2=55778&view=diff
==============================================================================
--- trunk/sudo/src/dialog-user.ycp (original)
+++ trunk/sudo/src/dialog-user.ycp Thu Feb 26 10:27:11 2009
@@ -101,8 +101,8 @@
                {
                    alias_members = add(alias_members, new_member);
                    users = filter(string s, users, ``(s != new_member));
+                   RedrawUserAlias( alias_members );
                }
-               RedrawUserAlias( alias_members );
                /* delete users */
            }else if (ret == "remove_member"){
                        string current_item = (string) 
UI::QueryWidget(`id("user_alias_members"), `CurrentItem);

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx