Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2020-03-22 14:16:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Sun Mar 22 14:16:12 2020 rev:475 rq:786092 version:4.2.74 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2020-03-14 09:54:52.519089653 +0100 +++ /work/SRC/openSUSE:Factory/.yast2.new.3160/yast2.changes 2020-03-22 14:16:13.974020730 +0100 @@ -1,0 +2,7 @@ +Tue Mar 17 15:46:35 UTC 2020 - Ladislav Slezák <[email protected]> + +- Fixed CWM::MultiStatusSelector help text icons displayed during + installation (related to bsc#1157780, bsc#1161308, bsc#1161200) +- 4.2.74 + +------------------------------------------------------------------- Old: ---- yast2-4.2.73.tar.bz2 New: ---- yast2-4.2.74.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.bdWMkM/_old 2020-03-22 14:16:15.098021451 +0100 +++ /var/tmp/diff_new_pack.bdWMkM/_new 2020-03-22 14:16:15.102021454 +0100 @@ -17,7 +17,7 @@ Name: yast2 -Version: 4.2.73 +Version: 4.2.74 Release: 0 Summary: YaST2 Main Package License: GPL-2.0-only ++++++ yast2-4.2.73.tar.bz2 -> yast2-4.2.74.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.2.73/library/cwm/src/lib/cwm/multi_status_selector.rb new/yast2-4.2.74/library/cwm/src/lib/cwm/multi_status_selector.rb --- old/yast2-4.2.73/library/cwm/src/lib/cwm/multi_status_selector.rb 2020-03-13 11:47:39.000000000 +0100 +++ new/yast2-4.2.74/library/cwm/src/lib/cwm/multi_status_selector.rb 2020-03-18 09:20:55.000000000 +0100 @@ -299,12 +299,12 @@ def self.help help_text = "<p>" # TRANSLATORS: help text for a not selected check box - help_text << "#{icon_for(UNSELECTED)} = #{_("Not selected")}<br />" + help_text << "#{icon_for(UNSELECTED, mode: mode)} = #{_("Not selected")}<br />" # TRANSLATORS: help text for a selected check box - help_text << "#{icon_for(SELECTED)} = #{_("Selected")}<br />" + help_text << "#{icon_for(SELECTED, mode: mode)} = #{_("Selected")}<br />" # TRANSLATORS: help text for an automatically selected check box # (it has a different look that a user selected check box) - help_text << "#{icon_for(AUTO_SELECTED)} = #{_("Auto selected")}" + help_text << "#{icon_for(AUTO_SELECTED, mode: mode)} = #{_("Auto selected")}" help_text << "</p>" help_text end @@ -405,11 +405,28 @@ "#{checkbox_input} #{checkbox_label}" end + # Determines whether running in installation mode + # + # We do not use Stage.initial because of firstboot, which runs in 'installation' mode + # but in 'firstboot' stage. + # + # @return [Boolean] Boolean if running in installation or update mode + def self.installation? + Yast::Mode.installation || Yast::Mode.update + end + + # Returns the current mode + # + # @return [String] "normal" in a running system; "inst" during the installation + def self.mode + installation? ? "inst" : "normal" + end + private # @see .icon_for def icon - self.class.icon_for(status, mode: mode, state: state) + self.class.icon_for(status, mode: self.class.mode, state: state) end # Builds the check box input representation @@ -434,13 +451,6 @@ end end - # Returns the current mode - # - # @return [String] "normal" in a running system; "inst" during the installation - def mode - installation? ? "inst" : "normal" - end - # Returns the current input state # # @return [String] "enabled" when item must be enabled; "disabled" otherwise @@ -462,20 +472,10 @@ # "black" otherwise def color return "grey" unless enabled? - return "white" if installation? + return "white" if self.class.installation? "black" end - - # Determines whether running in installation mode - # - # We do not use Stage.initial because of firstboot, which runs in 'installation' mode - # but in 'firstboot' stage. - # - # @return [Boolean] Boolean if running in installation or update mode - def installation? - Yast::Mode.installation || Yast::Mode.update - end end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.2.73/library/cwm/test/multi_status_selector_test.rb new/yast2-4.2.74/library/cwm/test/multi_status_selector_test.rb --- old/yast2-4.2.73/library/cwm/test/multi_status_selector_test.rb 2020-03-13 11:47:39.000000000 +0100 +++ new/yast2-4.2.74/library/cwm/test/multi_status_selector_test.rb 2020-03-18 09:20:55.000000000 +0100 @@ -436,4 +436,28 @@ end end end + + describe ".help" do + context "in installation" do + before do + allow(Yast::Mode).to receive(:installation).and_return(true) + allow(Yast::Mode).to receive(:update).and_return(false) + end + + it "uses the installation icon" do + expect(subject.class.help).to include("inst_checkbox-on.svg") + end + end + + context "in installed system" do + before do + allow(Yast::Mode).to receive(:installation).and_return(false) + allow(Yast::Mode).to receive(:update).and_return(false) + end + + it "uses the standard icon" do + expect(subject.class.help).to include("checkbox-on.svg") + end + end + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.2.73/package/yast2.changes new/yast2-4.2.74/package/yast2.changes --- old/yast2-4.2.73/package/yast2.changes 2020-03-13 11:47:39.000000000 +0100 +++ new/yast2-4.2.74/package/yast2.changes 2020-03-18 09:20:55.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Mar 17 15:46:35 UTC 2020 - Ladislav Slezák <[email protected]> + +- Fixed CWM::MultiStatusSelector help text icons displayed during + installation (related to bsc#1157780, bsc#1161308, bsc#1161200) +- 4.2.74 + +------------------------------------------------------------------- Fri Mar 13 01:54:58 UTC 2020 - David Diaz <[email protected]> - CWM::MultiStatusSelector minor improvements (related to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.2.73/package/yast2.spec new/yast2-4.2.74/package/yast2.spec --- old/yast2-4.2.73/package/yast2.spec 2020-03-13 11:47:39.000000000 +0100 +++ new/yast2-4.2.74/package/yast2.spec 2020-03-18 09:20:55.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2 -Version: 4.2.73 +Version: 4.2.74 Release: 0 Summary: YaST2 Main Package License: GPL-2.0-only
