Merge pull request #22 from gilsonsouza/Code-11-SP4

SLE-11-SP4 SR number can be longer than 11 digits
yast · Jul 24, 2017 · 9dd8897 · 9dd8897
2 parents f526e55 + 91236dd
commit 9dd8897
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.17.21
+2.17.22
diff --git a/package/yast2-support.changes b/package/yast2-support.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jul 20 12:07:56 UTC 2017 - gsouza@suse.com
+
+- Allow support request number longer than 11 digits (bsc#1040706)
+- 2.17.22
+
 -------------------------------------------------------------------
 Thu Mar 19 12:23:02 UTC 2015 - ancor@suse.com
 

diff --git a/src/dialogs.ycp b/src/dialogs.ycp
@@ -502,7 +502,7 @@ any ContactDialog () {
 	 )),
 	`Frame (_("Upload Information"), `VBox(
 	  `Left(`InputField(`id(`target), _("Upload Target"), deletechars(Support::options["VAR_OPTION_UPLOAD_TARGET"]:"", "'"))),
-	  `Left(`InputField(`id(`novell_number), _("Novell 11 digit service request number"), Support::novell_number))
+	  `Left(`InputField(`id(`novell_number), _("Service request number"), Support::novell_number))
 	)));
 
     Wizard::SetContentsButtons(caption, contents, HELPS["contact"]:"",
@@ -530,8 +530,8 @@ any ContactDialog () {
 	  Support::options["VAR_OPTION_GPG_UID"]=(string)UI::QueryWidget(`gpg_uid, `Value);
 	  Support::novell_number=(string)UI::QueryWidget(`novell_number, `Value);
 	  if (size(Support::novell_number)>0){
-		if (size(Support::novell_number)!=11){
-		 Popup::Error(_("The SR number must be 11 digits"));
+		if (size(Support::novell_number)<11){
+		 Popup::Error(_("The service request number must be at least 11 digits"));
 		 ret=nil;
 		 continue;
 		}

diff --git a/src/helps.ycp b/src/helps.ycp
@@ -125,7 +125,7 @@ ftp://ftp.novell.com/incoming<br>
 scp://central.server.foo.com/supportconfig/archives</p>")
     /* Contact dialog help 4/4 */
     + _("<p><b>Note:</b> If you are uploading a supportconfig tarball to Novell Technical Support,
-make sure you include the Novell 11 digit service request number from your open service request."),
+make sure you include the service request number from your open service request."),
 
     /* Collecting data dialkog help 1/1 */
     "collecting" : _("<p><b><big>Collecting Data</big></b>><br>