From 45711be5c93f08f19a172d071ab918940498321c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20Z=C3=A1zrivec?= Date: Tue, 18 Apr 2017 16:02:27 +0200 Subject: [PATCH] Merge pull request #1042 from eclarizio/BZ1435758 Fix for inability to edit/add service dialog imported from CF 4.0 to 4.2 (cherry picked from commit 34699103dd0a2b512c046eb3173017b6608ea08b) https://bugzilla.redhat.com/show_bug.cgi?id=1443670 --- .../miq_ae_customization/_dialog_sample.html.haml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/app/views/miq_ae_customization/_dialog_sample.html.haml b/app/views/miq_ae_customization/_dialog_sample.html.haml index 11a70dfda43..2428263ac9c 100644 --- a/app/views/miq_ae_customization/_dialog_sample.html.haml +++ b/app/views/miq_ae_customization/_dialog_sample.html.haml @@ -69,15 +69,7 @@ - else - if field.values.length > 1 - - if field.sort_by.to_s != "none" - - if field.data_type == "integer" - - val = field.values.sort_by { |d| field.sort_by == :value ? d.first.to_i : d.last.to_i } - - val = val.reverse if field.sort_order == :descending - - else - - val = field.values.sort_by { |d| field.sort_by == :value ? d.first : d.last } - - val = val.reverse if field.sort_order == :descending - - else - - val = copy_array(field.values) + - val = copy_array(field.values) - if field.type == "DialogFieldDropDownList" - if field.required