[yast-commit] r67377 - in /trunk/nfs-client: VERSION package/yast2-nfs-client.changes src/ui.ycp

Author: mfilka Date: Wed Feb 8 13:03:57 2012 New Revision: 67377 URL: http://svn.opensuse.org/viewcvs/yast?rev=67377&view=rev Log: Base server hostname combobox on existing values - bnc#547983 Modified: trunk/nfs-client/VERSION trunk/nfs-client/package/yast2-nfs-client.changes trunk/nfs-client/src/ui.ycp Modified: trunk/nfs-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/VERSION?rev=67377&r1=67376&r2=67377&view=diff ============================================================================== --- trunk/nfs-client/VERSION (original) +++ trunk/nfs-client/VERSION Wed Feb 8 13:03:57 2012 @@ -1 +1 @@ -2.21.2 +2.21.3 Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-client.changes?rev=67377&r1=67376&r2=67377&view=diff ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Wed Feb 8 13:03:57 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 8 12:00:10 UTC 2012 - mfilka@suse.com + +- Base server hostname combobox on existing values - bnc#547983 + +------------------------------------------------------------------- Wed Dec 7 10:05:12 UTC 2011 - coolo@suse.com - fix license to be in spdx.org format Modified: trunk/nfs-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/ui.ycp?rev=67377&r1=67376&r2=67377&view=diff ============================================================================== --- trunk/nfs-client/src/ui.ycp (original) +++ trunk/nfs-client/src/ui.ycp Wed Feb 8 13:03:57 2012 @@ -58,6 +58,11 @@ list<string> hosts = nil; /** + * List of already defined nfs mount points + */ + list< map > nfs_entries = Nfs::nfs_entries; + + /** * Let the user choose one of a list of items * @param title selectionbox title * @param items a list of items @@ -178,6 +183,7 @@ `Bottom (button) ); } + /** * Ask user for an entry. * @param fstab_ent $["spec": "file": "mntops":] or nil @@ -213,6 +219,21 @@ servers = [ proposed_server ]; } + // append already defined servers - bug #547983 + foreach( map nfs_entry, nfs_entries, + { + term couple = SpecToServPath( nfs_entry[ "spec"]:""); + string known_server = ""; + + known_server = couple[0]:""; + + if( !contains( servers, known_server)) + servers = add( servers, known_server); + }); + + servers = sort( servers); + // + UI::OpenDialog( `opt(`decorated), `HBox( @@ -232,7 +253,8 @@ ), `HSpacing(0.5), TextAndButton ( - `TextEntry(`id(`pathent), + `InputField( `id(`pathent), + `opt(`hstretch), // textentry label _("&Remote Directory"), pth), // pushbutton label, @@ -245,7 +267,8 @@ `Left( `CheckBox(`id(`nfs4), _("NFS&v4 Share"), nfs4)), `Left( TextAndButton ( - `TextEntry(`id(`mountent), + `InputField(`id(`mountent), + `opt(`hstretch), // textentry label _("&Mount Point (local)"), mount), // button label @@ -256,7 +279,7 @@ ), // textentry label `VSpacing(0.2), - `TextEntry(`id(`optionsent), _("O&ptions"), options), + `InputField(`id(`optionsent), `opt( `hstretch), _("O&ptions"), options), `VSpacing(0.2), `ButtonBox( `PushButton(`id(`ok), `opt(`default, `key_F10), Label::OKButton()), @@ -468,7 +491,6 @@ ]; map fw_cwm_widget = CWMFirewallInterfaces::CreateOpenFirewallWidget (fw_settings); - list< map > nfs_entries = Nfs::nfs_entries; map modify_line = $[]; // Help, part 1 of 3 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org