Fix issue weight selection

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/helpers/issues_helper.rb

@@ -121,13 +121,13 @@ module IssuesHelper
     end
   end
 
-  def projects_weight_options
+  def projects_weight_options(selected = nil)
     options = (Issue::WEIGHT_RANGE).map do |i|
       [i, i]
     end
 
     options.unshift(['Any', nil])
-    options_for_select(options, params[:weight])
+    options_for_select(options, selected || params[:weight])
   end
 
   # Required for Banzai::Filter::IssueReferenceFilter

app/views/shared/issuable/_form.html.haml

@@ -60,7 +60,7 @@
         = icon('magnet')
         Weight
       .col-sm-10
-        = f.select :weight, projects_weight_options, { include_blank: true },
+        = f.select :weight, projects_weight_options(issuable.weight), { include_blank: true },
           { class: 'select2 js-select2', data: { placeholder: "Select weight" }}
 
   .form-group

app/views/shared/issuable/_sidebar.html.haml

@@ -68,7 +68,7 @@
           - else
             .light None
         .selectbox
-          = f.select :weight, projects_weight_options, { include_blank: true },
+          = f.select :weight, projects_weight_options(issuable.weight), { include_blank: true },
             { class: 'select2 js-select2', data: { placeholder: "Select weight" }}
 
     .block