From 7f8f929166d210b58973d84f9c2eb8fa1a101b51 Mon Sep 17 00:00:00 2001
From: Michal Filka <mfilka@suse.cz>
Date: Mon, 19 Dec 2016 13:48:33 +0100
Subject: [PATCH] Implemented read-only proposal with recovery

---
 src/lib/installation/proposal_runner.rb |  2 +-
 src/lib/installation/proposal_store.rb  | 38 +++++++++++++++++++++----
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/lib/installation/proposal_runner.rb b/src/lib/installation/proposal_runner.rb
index 8c1ad7aa9..953c95c8f 100644
--- a/src/lib/installation/proposal_runner.rb
+++ b/src/lib/installation/proposal_runner.rb
@@ -807,7 +807,7 @@ def html_header(submod)
       title = @store.title_for(submod)
 
       # do not add a link if the module is read-only or link is already included
-      heading = if @store.read_only?(submod) || title.include?("<a")
+      heading = if @store.read_only_no_recovery?(submod) || title.include?("<a")
         title
       else
         Yast::HTML.Link(title, @store.id_for(submod))
diff --git a/src/lib/installation/proposal_store.rb b/src/lib/installation/proposal_store.rb
index d5f40ddb9..69a6ed543 100644
--- a/src/lib/installation/proposal_store.rb
+++ b/src/lib/installation/proposal_store.rb
@@ -250,12 +250,32 @@ def title_for(client)
       title.gsub(/<a.*?>(.*?)<\/a>/, "\\1")
     end
 
-    # Returns the read-only flag
+    def read_only?(client)
+      read_only_no_recovery?(client) || read_only_with_recovery?(client)
+    end
+
+    # Checks if the client's proposal is configured as "hard" read-only
+    #
+    # "hard" read-only means that the proposal is always read-only
+    # "soft" read-only means that the proposal is made changeable when an error
+    # in proposal is detected.
     #
     # @param [String] client
-    # @return [String] a title provided by the description API
-    def read_only?(client)
-      read_only_proposals.include?(client)
+    # @return [Boolean] if the client is marked as "hard" read only
+    def read_only_no_recovery?(client)
+      read_only_proposals[:hard].include?(client)
+    end
+
+    # Checks if the client's proposal is configured as "soft" read-only
+    #
+    # "hard" read-only means that the proposal is always read-only
+    # "soft" read-only means that the proposal is made changeable when an error
+    # in proposal is detected.
+    #
+    # @param [String] client
+    # @return [Boolean] if the client is marked as "soft" read only
+    def read_only_with_recovery?(client)
+      read_only_proposals[:soft].include?(client)
     end
 
     # Calls client('AskUser'), to change a setting interactively (if link is the
@@ -300,13 +320,19 @@ def client_for_link(link)
     def read_only_proposals
       return @read_only_proposals if @read_only_proposals
 
-      @read_only_proposals = []
+      @read_only_proposals = { hard: [], soft: [] }
 
       properties.fetch("proposal_modules", []).each do |proposal|
         next unless proposal["read_only"]
 
         name = full_module_name(proposal["name"])
-        @read_only_proposals << name
+
+        case proposal["read_only"]
+        when "hard"
+          @read_only_proposals[:hard] << name
+        when "soft"
+          @read_only_proposals[:soft] << name
+        end
       end
 
       log.info "Found read-only proposals: #{@read_only_proposals}"