Merge pull request #1248 from lfu/dialog_field_sort_none_1389010

Check :sort_by: :none to keep the field values in the order that they are inserted in the file. (cherry picked from commit 662b026) https://bugzilla.redhat.com/show_bug.cgi?id=1458447
ManageIQ · Jun 5, 2017 · 7656be5 · 7656be5
1 parent d45fce6
commit 7656be5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/views/miq_request/_prov_field.html.haml b/app/views/miq_request/_prov_field.html.haml
@@ -277,7 +277,9 @@
                   - opts = [["<#{_('Choose')}>", nil]]
               - else
                 - opts = multiple ? [] : [["<#{_('None')}>", nil]]
-              - if field_hash[:data_type] == :integer
+              - if field_hash[:sort_by] == :none
+                - opts += Array(field_hash[:values].invert)
+              - elsif field_hash[:data_type] == :integer
                 - opts += Array(field_hash[:values].invert).sort_by(&:last)
               - else
                 - opts += Array(field_hash[:values].invert).sort_by { |a| a.first.downcase }