File 0002-Don-t-use-Rails-titleize-method-in-wizards... of Package hawk2.3651

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-Don-t-use-Rails-titleize-method-in-wizards-bsc-98769.patch of Package hawk2.3651

From ebcc80682797acd6e437cdbf28b4ee0fd38b0420 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <krig@koru.se>
Date: Wed, 13 Jul 2016 18:48:25 +0200
Subject: [PATCH] Don't use Rails titleize method in wizards (bsc#987696)

---
 hawk/app/models/step.rb               | 4 ++--
 hawk/app/models/step_parameter.rb     | 2 +-
 hawk/app/models/wizard.rb             | 2 +-
 hawk/app/views/wizards/show.html.haml | 6 ------
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/hawk/app/models/step.rb b/hawk/app/models/step.rb
index 5421f59..f309a51 100644
--- a/hawk/app/models/step.rb
+++ b/hawk/app/models/step.rb
@@ -50,10 +50,10 @@ class Step
   end
 
   def title
-    if name.blank?
+    if shortdesc.blank?
       @parent.title
     else
-      @name.gsub(/[_-]/, " ").titleize
+      shortdesc
     end
   end
 
diff --git a/hawk/app/models/step_parameter.rb b/hawk/app/models/step_parameter.rb
index d5bf17d..247f2bb 100644
--- a/hawk/app/models/step_parameter.rb
+++ b/hawk/app/models/step_parameter.rb
@@ -43,7 +43,7 @@ class StepParameter
   end
 
   def title
-    @name.gsub(/[_-]/, " ").titleize
+    @name.gsub(/[_-]/, " ")
   end
 
   def attrlist_type
diff --git a/hawk/app/models/wizard.rb b/hawk/app/models/wizard.rb
index f9693fb..c2d39e3 100644
--- a/hawk/app/models/wizard.rb
+++ b/hawk/app/models/wizard.rb
@@ -43,7 +43,7 @@ class Wizard
   end
 
   def title
-    @name.gsub(/[_-]/, " ").titleize
+    @name.gsub(/[_-]/, " ")
   end
 
   def load_from(data)
diff --git a/hawk/app/views/wizards/show.html.haml b/hawk/app/views/wizards/show.html.haml
index 61fdcdd..8c2f3ee 100644
--- a/hawk/app/views/wizards/show.html.haml
+++ b/hawk/app/views/wizards/show.html.haml
@@ -18,8 +18,6 @@
               = main_form.fields_for :steps, step do |step_form|
                 .tab-pane{ id: "step#{index}", role: :tabpanel }
                   %fieldset
-                    %legend
-                      = step.title
                     - if step.longdesc.strip.length > 0
                       .well
                         = longdesc_format step.longdesc
@@ -42,10 +40,6 @@
                       .content
 
                   - step.steps.each do |substep|
-                    - if substep.title != step.title
-                      %fieldset
-                        %legend
-                          = substep.title
                     - substep.basic.each do |param|
                       = render :partial => "param", :locals => { :param => param, :step => step, :index => index, :form => main_form }
                     - unless substep.advanced.empty?
-- 
2.9.0

Places

File 0002-Don-t-use-Rails-titleize-method-in-wizards-bsc-98769.patch of Package hawk2.3651

Places