Merge branch 'SLE-12-SP1' into 'SLE-12-SP2'

yast · Jul 18, 2017 · 9a07cf1 · 9a07cf1
2 parents 2f3a285 + e0d6ab0
commit 9a07cf1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/package/yast2-support.changes b/package/yast2-support.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jun 16 08:08:10 UTC 2017 - jreidinger@suse.com
+
+- Allow service request number longer then 11 digits (bsc#1040706)
+- 3.1.7
+
 -------------------------------------------------------------------
 Thu Mar 19 11:14:48 UTC 2015 - ancor@suse.com
 

diff --git a/package/yast2-support.spec b/package/yast2-support.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-support
-Version:        3.1.6
+Version:        3.1.7
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/include/support/dialogs.rb b/src/include/support/dialogs.rb
@@ -771,7 +771,7 @@ def ContactDialog
             Left(
               InputField(
                 Id(:novell_number),
-                _("11-digit service request number"),
+                _("Service request number"),
                 Support.novell_number
               )
             )
@@ -847,8 +847,8 @@ def ContactDialog
             UI.QueryWidget(:novell_number, :Value)
           )
           if Ops.greater_than(Builtins.size(Support.novell_number), 0)
-            if Builtins.size(Support.novell_number) != 11
-              Popup.Error(_("The SR number must be 11 digits"))
+            if Builtins.size(Support.novell_number) < 11
+              Popup.Error(_("The service request number must be at least 11 digits"))
               ret = nil
               next
             end

diff --git a/src/include/support/helps.rb b/src/include/support/helps.rb
@@ -131,7 +131,7 @@ def initialize_support_helps(include_target)
           ) +
           # Contact dialog help 4/4
           _(
-            "<p><b>Note:</b> If you are uploading a supportconfig tarball to Global Technical Support,\nmake sure you include the 11-digit service request number from your open service request.\n"
+            "<p><b>Note:</b> If you are uploading a supportconfig tarball to Global Technical Support,\nmake sure you include the service request number from your open service request.\n"
           ),
         # Collecting data dialkog help 1/1
         "collecting"     => _(