Base server hostname combobox on existing values - bnc#547983

Conflicts: package/yast2-nfs-client.changes
yast · Nov 22, 2012 · e6749b7 · e6749b7
1 parent 1d40282
commit e6749b7
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 19 deletions.
diff --git a/package/yast2-nfs-client.changes b/package/yast2-nfs-client.changes
@@ -2,6 +2,7 @@
 Mon Oct 15 08:28:10 UTC 2012 - mfilka@suse.com
 
 - ported several old fixes from master branch: 
+  - Base server hostname combobox on existing values - bnc#547983
   - Fixed handling of return symbols (buggy patch for bnc#589541, now
     bnc#608166)
   - added fix for problem with OK button (bnc#589541)

diff --git a/src/Nfs.ycp b/src/Nfs.ycp
@@ -117,22 +117,23 @@
 		}
 	    });
 
-	    //Backwards compatibility: with FaTE#302031, we support nfsv4 mounts
-	    //thus we need to keep info on nfs version (v3 vs. v4)
-	    //But older AY profiles might not contain this element
-	    //so let's assume nfsv3 in that case (#395850)
-	    if ( !haskey(s, "vfstype") )
-	    {
-	        s["vfstype"] = "nfs";
-	    } else {
- 		if (s["vfstype"]:"nfs" == "nfs4")
-		{
-		    nfs4_enabled = true;
- 		}
-	    }
+            //Backwards compatibility: with FaTE#302031, we support nfsv4 mounts
+            //thus we need to keep info on nfs version (v3 vs. v4)
+            //But older AY profiles might not contain this element
+            //so let's assume nfsv3 in that case (#395850)
+            if ( !haskey(s, "vfstype") )
+            {
+                s["vfstype"] = "nfs";
+            } else {
+                if (s["vfstype"]:"nfs" == "nfs4")
+                {
+                    nfs4_enabled = true;
+                }
+            }
 	    return s;
 
 	});
+
 	if (missing)
 	{
 	    return false;
@@ -279,10 +280,10 @@
 	Progress::set(progress_orig);
 
 	portmapper = FindPortmapper();
-	//There is neither rpcbind  nor portmap  
+	//There is neither rpcbind  nor portmap
 	if ( portmapper == "" )
 	{
-	    //so let's install rpcbind (default since #423026) 
+	    //so let's install rpcbind (default since #423026)
 	    required_packages = add( required_packages, "rpcbind" );
 	    portmapper = "rpcbind";
 	}

diff --git a/src/ui.ycp b/src/ui.ycp
@@ -57,6 +57,11 @@
 
     list<string> hosts = nil;
 
+    /**
+     * List of already defined nfs mount points
+     */
+    list< map <string,any> > nfs_entries = Nfs::nfs_entries;
+
     /**
      * Let the user choose one of a list of items
      * @param title	selectionbox title
@@ -178,6 +183,7 @@
 	    `Bottom (button)
 	    );
     }
+
     /**
      * Ask user for an entry.
      * @param fstab_ent	$["spec": "file": "mntops":] or nil
@@ -213,6 +219,19 @@
 	        servers = [ proposed_server ];
 	}
 
+	// append already defined servers - bug #547983
+        foreach( map nfs_entry, nfs_entries,
+        {
+	    term couple = SpecToServPath( nfs_entry[ "spec"]:"");
+	    string known_server = couple[0]:"";
+
+	    if( !contains( servers, known_server))
+	        servers = add( servers, known_server);
+        });
+
+        servers = sort( servers);
+	//
+
 	UI::OpenDialog(
 	    `opt(`decorated),
 	    `HBox(
@@ -232,7 +251,8 @@
 			),
 			`HSpacing(0.5),
 			TextAndButton (
-			    `TextEntry(`id(`pathent),
+			    `InputField( `id(`pathent),
+					`opt(`hstretch),
 				       // textentry label
 				       _("&Remote Directory"), pth),
 			    // pushbutton label,
@@ -245,7 +265,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 +277,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 +489,6 @@ read the man page mount(8).</p>");
     ];
     map<string,any> fw_cwm_widget = CWMFirewallInterfaces::CreateOpenFirewallWidget (fw_settings);
 
-    list< map <string,any> > nfs_entries = Nfs::nfs_entries;
     map <string, any> modify_line = $[];
 
     // Help, part 1 of 3