From aa11f1be97f1744d815e620dd8b826374e897556 Mon Sep 17 00:00:00 2001
From: Alexander Graul <agraul@suse.com>
Date: Fri, 7 Dec 2018 17:00:15 +0100
Subject: [PATCH 1/2] Rename and clean set_flavors up

We use the American spelling ("flavor") everywhere else in the file,
this method should not be an outlier.
The method is shorter now and uses a guard clause instead of an if-else
block and a more concise and efficient sort.
---
 app/controllers/download_controller.rb | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/controllers/download_controller.rb b/app/controllers/download_controller.rb
index 6bd7fa904..3c240ad48 100644
--- a/app/controllers/download_controller.rb
+++ b/app/controllers/download_controller.rb
@@ -38,7 +38,7 @@ def appliance
         nil
       end
     end
-    set_flavours
+    set_flavors
     @page_title = format(_("Download appliance from %s"), @project)
     render_page :appliance
   end
@@ -80,7 +80,7 @@ def package
         nil
       end
     end
-    set_flavours
+    set_flavors
     @page_title = format(_("Install package %s / %s"), @project, @package)
     render_page :package
   end
@@ -122,7 +122,7 @@ def pattern
         nil
       end
     end
-    set_flavours
+    set_flavors
     @page_title = format(_("Install pattern %s / %s"), @project, @pattern)
     render_page :package
   end
@@ -195,13 +195,9 @@ def set_distro_flavor distro
     end
   end
 
-  def set_flavours
-    if @data.nil?
-      head :forbidden
-    else
-      # collect distro types from @data
-      @flavors = @data.values.collect { |i| i[:flavor] }.uniq.sort { |x, y| x.downcase <=> y.downcase }
-    end
+  def set_flavors
+    return head :forbidden unless @data
+    @flavors = @data.values.collect { |i| i[:flavor] }.uniq.sort_by(&:downcase)
   end
 
   def get_image_type filename

From 44063691ea4e4087677f282b452c17e06c567375 Mon Sep 17 00:00:00 2001
From: Alexander Graul <agraul@suse.com>
Date: Fri, 7 Dec 2018 17:03:26 +0100
Subject: [PATCH 2/2] Remove unused method

set_parameters was not used anywhere.
---
 app/controllers/download_controller.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/controllers/download_controller.rb b/app/controllers/download_controller.rb
index 3c240ad48..0ea562494 100644
--- a/app/controllers/download_controller.rb
+++ b/app/controllers/download_controller.rb
@@ -145,10 +145,6 @@ def ymp_without_arch_and_version
 
   private
 
-  def set_parameters
-    @hide_search_box = true
-  end
-
   def render_page page_template
     @box_title = @page_title
     respond_to do |format|