From 37aa81c5a3b8b0c92f33c754292ac3c88d48b039 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Hal=C3=A1sz?= Date: Wed, 24 Jul 2019 14:05:40 +0200 Subject: [PATCH 1/3] Drop the unnecessary code related to forcing old dialog use --- .../mixins/custom_button_dialog_form_mixin.rb | 16 ------- app/helpers/application_helper/dialogs.rb | 10 ---- app/services/dialog_local_service.rb | 2 - .../dialogs/_dialog_provision.html.haml | 5 +- .../custom_button_dialog_form_mixin_spec.rb | 46 +++---------------- .../application_helper/dialogs_spec.rb | 39 ---------------- spec/services/dialog_local_service_spec.rb | 3 -- 7 files changed, 7 insertions(+), 114 deletions(-) diff --git a/app/controllers/mixins/custom_button_dialog_form_mixin.rb b/app/controllers/mixins/custom_button_dialog_form_mixin.rb index ecede80ce8d..b059c9c2f9c 100644 --- a/app/controllers/mixins/custom_button_dialog_form_mixin.rb +++ b/app/controllers/mixins/custom_button_dialog_form_mixin.rb @@ -9,27 +9,11 @@ def set_custom_button_dialog_presenter(options) :partial => "shared/dialogs/dialog_provision", :locals => options[:dialog_locals] ]) - unless using_new_dialog_runner?(options) - presenter.update(:form_buttons_div, r[ - :partial => 'layouts/x_dialog_buttons', - :locals => { - :action_url => "dialog_form_button_pressed", - :record_id => @edit[:rec_id], - } - ]) - presenter.show(:form_buttons_div) - end presenter[:right_cell_text] = @right_cell_text presenter.set_visibility(false, :toolbar) presenter.set_visibility(false, :adv_searchbox_div) presenter[:lock_sidebar] = true presenter end - - private - - def using_new_dialog_runner?(options) - options[:dialog_locals].present? && options[:dialog_locals][:force_old_dialog_use].to_s == "false" - end end end diff --git a/app/helpers/application_helper/dialogs.rb b/app/helpers/application_helper/dialogs.rb index 84f446b9654..599b96e7dd2 100644 --- a/app/helpers/application_helper/dialogs.rb +++ b/app/helpers/application_helper/dialogs.rb @@ -158,16 +158,6 @@ def auto_refresh_listening_options(options, trigger_override) options.merge(:trigger => trigger_override) end - def force_old_dialogs?(dialog_locals, force_old_dialog_use) - return false if force_old_dialog_use == false - - if dialog_locals - return dialog_locals[:force_old_dialog_use].to_s == "true" - else - return true - end - end - private def auto_refresh_options(field, auto_refresh_options_hash) diff --git a/app/services/dialog_local_service.rb b/app/services/dialog_local_service.rb index 5dbf8ba1b73..ad86a8a34b1 100644 --- a/app/services/dialog_local_service.rb +++ b/app/services/dialog_local_service.rb @@ -8,7 +8,6 @@ def determine_dialog_locals_for_svc_catalog_provision(resource_action, target, f :target_type => target.kind_of?(ServiceTemplate) ? "service_template" : target.class.name.underscore, :real_target_type => target.class.base_class.name, :dialog_id => resource_action.dialog_id, - :force_old_dialog_use => false, :api_submit_endpoint => api_submit_endpoint, :api_action => "order", :finish_submit_endpoint => finish_submit_endpoint, @@ -26,7 +25,6 @@ def determine_dialog_locals_for_custom_button(obj, button_name, resource_action, :target_type => determine_target_type(obj), :real_target_type => obj.class.base_class.name, :dialog_id => resource_action.dialog_id, - :force_old_dialog_use => false, :api_submit_endpoint => submit_endpoint, :api_action => button_name, :finish_submit_endpoint => cancel_endpoint, diff --git a/app/views/shared/dialogs/_dialog_provision.html.haml b/app/views/shared/dialogs/_dialog_provision.html.haml index 0c730cf2230..72f87f9a15b 100644 --- a/app/views/shared/dialogs/_dialog_provision.html.haml +++ b/app/views/shared/dialogs/_dialog_provision.html.haml @@ -10,12 +10,9 @@ - real_target_type ||= @dialog_locals[:real_target_type] - dialog_id ||= @dialog_locals[:dialog_id] - resource_action_id ||= @dialog_locals[:resource_action_id] - - force_old_dialog_use = @dialog_locals[:force_old_dialog_use].to_s == "true" - open_url ||= @dialog_locals[:open_url] -- force_old_dialog_use ||= true if api_submit_endpoint.nil? - -- if Settings.product.old_dialog_user_ui || force_old_dialog_use +- if Settings.product.old_dialog_user_ui :javascript dialogFieldRefresh.unbindAllPreviousListeners(); diff --git a/spec/controllers/mixins/custom_button_dialog_form_mixin_spec.rb b/spec/controllers/mixins/custom_button_dialog_form_mixin_spec.rb index 6400e6b2495..b40f051416e 100644 --- a/spec/controllers/mixins/custom_button_dialog_form_mixin_spec.rb +++ b/spec/controllers/mixins/custom_button_dialog_form_mixin_spec.rb @@ -11,11 +11,7 @@ def x_active_tree def r @r ||= proc do |options| if options[:partial] == "shared/dialogs/dialog_provision" - if options[:locals].present? && options[:locals][:force_old_dialog_use].to_s == "false" - "main_div_with_new_dialog_runner" - else - "main_div" - end + "main_div" else "form_buttons_div" end @@ -40,38 +36,13 @@ def r end context "when dialog locals are present" do - context "when force_old_dialog_use is false" do - let(:options) { {:dialog_locals => {:force_old_dialog_use => false}} } - - it "passes the locals through the render method" do - allow(presenter).to receive(:update) do |_div, render_method| - expect(render_method).to eq("main_div_with_new_dialog_runner") - end - mixin.set_custom_button_dialog_presenter(options) - end - - it "does not update the form buttons div and does not show it" do - mixin.set_custom_button_dialog_presenter(options) - expect(presenter).not_to have_received(:update).with(:form_buttons_div, instance_of(String)).ordered - expect(presenter).not_to have_received(:show).with(:form_buttons_div).ordered - end - end - - context "when force_old_dialog_use is true" do - let(:options) { {:dialog_locals => {:force_old_dialog_use => true}} } + let(:options) { {:dialog_locals => {}} } - before do - mixin.set_custom_button_dialog_presenter(options) - end - - it "updates the main div" do - expect(presenter).to have_received(:update).with(:main_div, "main_div").ordered - end - - it "updates the form_buttons_div and shows it" do - expect(presenter).to have_received(:update).with(:form_buttons_div, "form_buttons_div").ordered - expect(presenter).to have_received(:show).with(:form_buttons_div).ordered + it "passes the locals through the render method" do + allow(presenter).to receive(:update) do |_div, render_method| + expect(render_method).to eq("main_div") end + mixin.set_custom_button_dialog_presenter(options) end end @@ -85,11 +56,6 @@ def r it "updates the main div" do expect(presenter).to have_received(:update).with(:main_div, "main_div").ordered end - - it "updates the form_buttons_div and shows it" do - expect(presenter).to have_received(:update).with(:form_buttons_div, "form_buttons_div").ordered - expect(presenter).to have_received(:show).with(:form_buttons_div).ordered - end end end end diff --git a/spec/helpers/application_helper/dialogs_spec.rb b/spec/helpers/application_helper/dialogs_spec.rb index c6fce1c34e7..09a8dcd9c91 100644 --- a/spec/helpers/application_helper/dialogs_spec.rb +++ b/spec/helpers/application_helper/dialogs_spec.rb @@ -603,43 +603,4 @@ expect(helper.auto_refresh_listening_options(options, true)).to eq(:trigger => true) end end - - describe "#force_old_dialogs?" do - let(:force_old_dialog_use) { true } - - context "when force_old_dialog_use is false" do - let(:force_old_dialog_use) { false } - let(:dialog_locals) { nil } - - it "returns false" do - expect(helper.force_old_dialogs?(dialog_locals, force_old_dialog_use)).to eq(false) - end - end - - context "when dialog locals exist" do - context "when the dialog local force old dialog use string matches 'true'" do - let(:dialog_locals) { {:force_old_dialog_use => "true"} } - - it "returns true" do - expect(helper.force_old_dialogs?(dialog_locals, force_old_dialog_use)).to eq(true) - end - end - - context "when the dialog local force old dialog use string does not match 'true'" do - let(:dialog_locals) { {:force_old_dialog_use => "potato"} } - - it "returns false" do - expect(helper.force_old_dialogs?(dialog_locals, force_old_dialog_use)).to eq(false) - end - end - end - - context "when dialog locals do not exist" do - let(:dialog_locals) { nil } - - it "returns true" do - expect(helper.force_old_dialogs?(dialog_locals, force_old_dialog_use)).to eq(true) - end - end - end end diff --git a/spec/services/dialog_local_service_spec.rb b/spec/services/dialog_local_service_spec.rb index f0f1abaadc3..28e051c4e58 100644 --- a/spec/services/dialog_local_service_spec.rb +++ b/spec/services/dialog_local_service_spec.rb @@ -16,7 +16,6 @@ :target_type => 'service_template', :real_target_type => "ServiceTemplate", :dialog_id => 654, - :force_old_dialog_use => false, :api_submit_endpoint => "/api/service_catalogs/123/service_templates/321", :api_action => "order", :finish_submit_endpoint => "finishsubmitendpoint", @@ -32,7 +31,6 @@ :target_type => 'service_template', :real_target_type => "ServiceTemplate", :dialog_id => 654, - :force_old_dialog_use => false, :api_submit_endpoint => "/api/service_catalogs/798/service_templates/987", :api_action => "order", :finish_submit_endpoint => "finishsubmitendpoint", @@ -55,7 +53,6 @@ :target_type => target_type, :real_target_type => real_target_type, :dialog_id => 654, - :force_old_dialog_use => false, :api_submit_endpoint => "/api/#{collection_name}/123", :api_action => "custom-button-name", :finish_submit_endpoint => finish_endpoint, From 39ff1ee4c78363804283a7564509323e7af07897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Hal=C3=A1sz?= Date: Wed, 24 Jul 2019 14:11:17 +0200 Subject: [PATCH 2/3] Drop the Settings.product.old_dialog_user_ui config feature --- app/controllers/catalog_controller.rb | 19 +------ app/controllers/vm_common.rb | 2 +- .../dialogs/_dialog_provision.html.haml | 51 ++++--------------- spec/controllers/catalog_controller_spec.rb | 11 +--- 4 files changed, 14 insertions(+), 69 deletions(-) diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index ed5def57a56..088eff047dc 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -607,11 +607,7 @@ def svc_catalog_provision ra, st, svc_catalog_provision_finish_submit_endpoint ) @in_a_form = true - if Settings.product.old_dialog_user_ui - dialog_initialize(ra, options) - else - replace_right_cell(:action => "dialog_provision", :dialog_locals => options[:dialog_locals]) - end + replace_right_cell(:action => "dialog_provision", :dialog_locals => options[:dialog_locals]) else # if catalog item has no dialog and provision button was pressed from list view add_flash(_("No Ordering Dialog is available"), :warning) @@ -1925,19 +1921,6 @@ def replace_right_cell(options = {}) presenter.hide(:toolbar) # incase it was hidden for summary screen, and incase there were no records on show_list presenter.hide(:form_buttons_div, :paging_div).remove_paging - if Settings.product.old_dialog_user_ui - presenter.show(:form_buttons_div, :buttons_on) - presenter.update( - :form_buttons_div, - r[ - :partial => "layouts/x_dialog_buttons", - :locals => { - :action_url => "dialog_form_button_pressed", - :record_id => @edit[:rec_id] - } - ] - ) - end else # Added so buttons can be turned off even tho div is not being displayed it still pops up Abandon changes box when trying to change a node on tree after saving a record presenter.hide(:buttons_on, :form_buttons_div).show(:toolbar).hide(:paging_div) diff --git a/app/controllers/vm_common.rb b/app/controllers/vm_common.rb index 68322eb68a8..12c4efa636c 100644 --- a/app/controllers/vm_common.rb +++ b/app/controllers/vm_common.rb @@ -1269,7 +1269,7 @@ def replace_right_cell(options = {}) end def show_old_dialog_submit_and_cancel_buttons?(params) - %w[vm_transform vm_transform_mass].include?(params[:pressed]) || Settings.product.old_dialog_user_ui + %w[vm_transform vm_transform_mass].include?(params[:pressed]) end # get the host that this vm belongs to diff --git a/app/views/shared/dialogs/_dialog_provision.html.haml b/app/views/shared/dialogs/_dialog_provision.html.haml index 72f87f9a15b..60ef1347b97 100644 --- a/app/views/shared/dialogs/_dialog_provision.html.haml +++ b/app/views/shared/dialogs/_dialog_provision.html.haml @@ -1,4 +1,3 @@ -- wf = @edit[:wf] if @edit && @edit[:wf] = render :partial => "layouts/flash_msg" - if @dialog_locals - api_submit_endpoint ||= @dialog_locals[:api_submit_endpoint] @@ -12,43 +11,15 @@ - resource_action_id ||= @dialog_locals[:resource_action_id] - open_url ||= @dialog_locals[:open_url] -- if Settings.product.old_dialog_user_ui - :javascript - dialogFieldRefresh.unbindAllPreviousListeners(); - .row - .col-md-12.col-lg-12 - #dialog_tabs - - auto_refreshable_field_indicies = build_auto_refreshable_field_indicies(wf) - - %ul.nav.nav-tabs - - wf.dialog.dialog_tabs.each do |tab| - = miq_tab_header(tab.id) do - = tab.label - .tab-content - - wf.dialog.dialog_tabs.each_with_index do |tab, tab_index| - = miq_tab_content(tab.id) do - - locals = {:wf => wf, - :tab => tab, - :tab_index => tab_index, - :auto_refreshable_field_indicies => auto_refreshable_field_indicies} - = render :partial => "shared/dialogs/dialog_tab", :locals => locals - - if @edit && !@edit[:explorer] && @record.respond_to?(:buttons) - = render :partial => "layouts/x_dialog_buttons", - :locals => {:action_url => 'dialog_form_button_pressed', - :record_id => @edit[:rec_id]} - :javascript - miq_tabs_init('#dialog_tabs') - -- else - = render :partial => "shared/dialogs/dialog_user", - :locals => {:dialog_id => dialog_id, - :resource_action_id => resource_action_id, - :target_id => target_id, - :target_type => target_type, - :real_target_type => real_target_type, - :finish_submit_endpoint => finish_submit_endpoint, - :api_submit_endpoint => api_submit_endpoint, - :api_action => api_action, - :cancel_endpoint => cancel_endpoint, - :open_url => open_url} += render :partial => "shared/dialogs/dialog_user", + :locals => {:dialog_id => dialog_id, + :resource_action_id => resource_action_id, + :target_id => target_id, + :target_type => target_type, + :real_target_type => real_target_type, + :finish_submit_endpoint => finish_submit_endpoint, + :api_submit_endpoint => api_submit_endpoint, + :api_action => api_action, + :cancel_endpoint => cancel_endpoint, + :open_url => open_url} diff --git a/spec/controllers/catalog_controller_spec.rb b/spec/controllers/catalog_controller_spec.rb index 6dbd01bcb01..bb7ce05f67a 100644 --- a/spec/controllers/catalog_controller_spec.rb +++ b/spec/controllers/catalog_controller_spec.rb @@ -976,16 +976,7 @@ allow(controller).to receive(:render).and_return(nil) end - it 'should render and make form buttons visible when product setting is set to render old dialogs' do - ::Settings.product.old_dialog_user_ui = true - controller.send(:replace_right_cell, :action => "dialog_provision", :presenter => @presenter) - expect(@presenter[:set_visible_elements]).to include(:form_buttons_div => true) - expect(@presenter[:set_visible_elements]).to include(:buttons_on => true) - end - - it 'should not render and show form buttons when product setting is NOT set to render old dialogs' do - ::Settings.product.old_dialog_user_ui = false - + it 'should not render and show form buttons' do controller.send(:replace_right_cell, :action => "dialog_provision", :presenter => @presenter) expect(@presenter[:set_visible_elements]).to include(:form_buttons_div => false) end From dd3d4703431503e3e32a1707981de57847427493 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Hal=C3=A1sz?= Date: Wed, 24 Jul 2019 14:39:37 +0200 Subject: [PATCH 3/3] Drop the no longer necessary dialog user views --- .../_auto_refresh_javascript.html.haml | 9 --- .../shared/dialogs/_dialog_field.html.haml | 71 ------------------- .../dialogs/_dialog_field_check_box.html.haml | 23 ------ ...field_date_and_date_time_control.html.haml | 46 ------------ .../_dialog_field_drop_down_list.html.haml | 40 ----------- .../_dialog_field_radio_button.html.haml | 50 ------------- .../_dialog_field_text_area_box.html.haml | 26 ------- .../dialogs/_dialog_field_text_box.html.haml | 33 --------- .../shared/dialogs/_dialog_group.html.haml | 14 ---- .../shared/dialogs/_dialog_tab.html.haml | 7 -- ...log_field_drop_down_list.html.haml_spec.rb | 18 ----- 11 files changed, 337 deletions(-) delete mode 100644 app/views/shared/dialogs/_auto_refresh_javascript.html.haml delete mode 100644 app/views/shared/dialogs/_dialog_field.html.haml delete mode 100644 app/views/shared/dialogs/_dialog_field_check_box.html.haml delete mode 100644 app/views/shared/dialogs/_dialog_field_date_and_date_time_control.html.haml delete mode 100644 app/views/shared/dialogs/_dialog_field_drop_down_list.html.haml delete mode 100644 app/views/shared/dialogs/_dialog_field_radio_button.html.haml delete mode 100644 app/views/shared/dialogs/_dialog_field_text_area_box.html.haml delete mode 100644 app/views/shared/dialogs/_dialog_field_text_box.html.haml delete mode 100644 app/views/shared/dialogs/_dialog_group.html.haml delete mode 100644 app/views/shared/dialogs/_dialog_tab.html.haml delete mode 100644 spec/views/shared/dialogs/_dialog_field_drop_down_list.html.haml_spec.rb diff --git a/app/views/shared/dialogs/_auto_refresh_javascript.html.haml b/app/views/shared/dialogs/_auto_refresh_javascript.html.haml deleted file mode 100644 index 838151ea9d7..00000000000 --- a/app/views/shared/dialogs/_auto_refresh_javascript.html.haml +++ /dev/null @@ -1,9 +0,0 @@ -:javascript - dialogFieldRefresh.listenForAutoRefreshMessages(JSON.parse("#{j(auto_refresh_options.to_json)}"), function(initializingIndex) { - dialogFieldRefresh.refreshField(JSON.parse("#{j(refresh_field_parameters.to_json)}"), function() { - var jsonOptions = JSON.parse('#{j(auto_refresh_listening_options(auto_refresh_options, true).to_json)}'); - jsonOptions.initializingIndex = initializingIndex; - - dialogFieldRefresh.triggerAutoRefresh(jsonOptions); - }); - }); diff --git a/app/views/shared/dialogs/_dialog_field.html.haml b/app/views/shared/dialogs/_dialog_field.html.haml deleted file mode 100644 index b28f23f270f..00000000000 --- a/app/views/shared/dialogs/_dialog_field.html.haml +++ /dev/null @@ -1,71 +0,0 @@ -- url = url_for_only_path(:action => 'dialog_field_changed', :id => @edit[:rec_id] || "new") if @edit -- dialog_mode = @edit[:dialog_mode] if @edit - -- case dialog_mode -- when :reconfigure - - edit = field.reconfigurable -- when :review - - edit = false -- else - - edit = !@edit.nil? - -.form-group{:id => "field_#{field.id}_tr", :style => field.visible ? 'display:block' : 'display:none'} - %label.control-label.col-md-2{:title => field.description} - = field.label - .col-md-8{:title => field.description} - - current_index = auto_refreshable_field_indicies.find_index(:tab_index => tab_index, - :group_index => group_index, - :field_index => field_index, - :auto_refresh => !!field.auto_refresh) - - auto_refresh_options = {:tab_index => tab_index, - :group_index => group_index, - :field_index => field_index, - :auto_refreshable_field_indicies => auto_refreshable_field_indicies, - :trigger => field.trigger_auto_refresh, - :current_index => current_index} - -# Don't show refresh buttons on Requests page - - show_refresh_button = field.show_refresh_button? && !controller.kind_of?(MiqRequestController) - - locals = {:edit => edit, - :field => field, - :url => url, - :wf => wf, - :auto_refresh_options => auto_refresh_options, - :show_refresh_button => show_refresh_button} - - case field.type - - when 'DialogFieldTextBox' - = render(:partial => "shared/dialogs/dialog_field_text_box", :locals => locals) - - - when 'DialogFieldTextAreaBox' - = render(:partial => "shared/dialogs/dialog_field_text_area_box", :locals => locals) - - - when 'DialogFieldCheckBox' - = render(:partial => "shared/dialogs/dialog_field_check_box", :locals => locals) - - - when 'DialogFieldDateControl', 'DialogFieldDateTimeControl' - = render(:partial => "shared/dialogs/dialog_field_date_and_date_time_control", :locals => locals) - - - when "DialogFieldRadioButton" - = render(:partial => "shared/dialogs/dialog_field_radio_button", :locals => locals) - - - when "DialogFieldDropDownList" - = render(:partial => "shared/dialogs/dialog_field_drop_down_list", :locals => locals) - - - when 'DialogFieldButton' - = button_tag(_("Save"), :class => edit ? 'btn btn-primary' : 'btn btn-primary disabled') - - - when 'DialogFieldTagControl' - - if edit - = select_tag(field.name, - options_for_select(dialog_dropdown_select_values(field), wf.value(field.name)), - drop_down_options(field, url)) - :javascript - dialogFieldRefresh.initializeDialogSelectPicker('#{field.name}', undefined, '#{url}', JSON.parse('#{j(auto_refresh_options.to_json)}')); - - - else - - value = wf.value(field.name) || '' # it returns in format for example Clasification::id - - _, classification_id = value.split('::') - - current_classification = Classification.find_by(:id => classification_id) - = h(current_classification.nil? ? '' : current_classification.description) - - :javascript - dialogFieldRefresh.setVisible($('#field_#{field.id}_tr'), #{field.visible}); diff --git a/app/views/shared/dialogs/_dialog_field_check_box.html.haml b/app/views/shared/dialogs/_dialog_field_check_box.html.haml deleted file mode 100644 index 8b7659c89cf..00000000000 --- a/app/views/shared/dialogs/_dialog_field_check_box.html.haml +++ /dev/null @@ -1,23 +0,0 @@ -= check_box_tag(field.name, "1", field.checked?, {:disabled => !edit}.merge(checkbox_tag_options(field, url, auto_refresh_options))) - -- if field.dynamic - - if field.auto_refresh - - javascript_locals = {:auto_refresh_options => auto_refresh_options, - :refresh_field_parameters => {:type => field.type, - :name => field.name, - :id => field.id}} - - = render(:partial => "shared/dialogs/auto_refresh_javascript", :locals => javascript_locals) - - - if show_refresh_button - = button_tag(_('Refresh'), :id => "refresh-dynamic-checkbox-#{field.id}", :class => "btn btn-default") - - :javascript - $('#refresh-dynamic-checkbox-#{field.id}').click(function() { - dialogFieldRefresh.refreshCheckbox("#{field.name}", "#{field.id}", function() { - var jsonOptions = JSON.parse('#{j(auto_refresh_options.to_json)}'); - jsonOptions.initialTrigger = true; - - dialogFieldRefresh.triggerAutoRefresh(jsonOptions); - }); - }); diff --git a/app/views/shared/dialogs/_dialog_field_date_and_date_time_control.html.haml b/app/views/shared/dialogs/_dialog_field_date_and_date_time_control.html.haml deleted file mode 100644 index a94cb480e80..00000000000 --- a/app/views/shared/dialogs/_dialog_field_date_and_date_time_control.html.haml +++ /dev/null @@ -1,46 +0,0 @@ -- if field.type == "DialogFieldDateControl" - - if edit - = datepicker_input_tag("miq_date__#{field.name}", field.value, date_tag_options(field, url, auto_refresh_options)) - - else - = field.value - -- if field.type == "DialogFieldDateTimeControl" - - date_val, time_val = field.value.split(" ") - - hour_val, minute_val = time_val.split(":") - - if edit - = datepicker_input_tag("miq_date__#{field.name}", date_val, date_tag_options(field, url, auto_refresh_options)) - - else - = date_val - -  at  - - if edit - = select_tag("start_hour", hour_select_options(hour_val), time_tag_options(field, url, "hour", auto_refresh_options)) - = ':' - = select_tag("start_min", minute_select_options(minute_val), time_tag_options(field, url, "min", auto_refresh_options)) - - - else - = "#{hour_val.rjust(2, '0')}:#{minute_val.rjust(2, '0')}" -   - = session[:user_tz] - -- if field.dynamic - - if field.auto_refresh - - javascript_locals = {:auto_refresh_options => auto_refresh_options, - :refresh_field_parameters => {:type => field.type, - :name => field.name, - :id => field.id}} - - = render(:partial => "shared/dialogs/auto_refresh_javascript", :locals => javascript_locals) - - - if show_refresh_button - = button_tag(_('Refresh'), :id => "refresh-dynamic-date-#{field.id}", :class => "btn btn-default") - - :javascript - $('#refresh-dynamic-date-#{field.id}').click(function() { - dialogFieldRefresh.refreshDateTime("#{field.name}", "#{field.id}", function() { - var jsonOptions = JSON.parse('#{j(auto_refresh_options.to_json)}'); - jsonOptions.initialTrigger = true; - - dialogFieldRefresh.triggerAutoRefresh(jsonOptions); - }); - }); diff --git a/app/views/shared/dialogs/_dialog_field_drop_down_list.html.haml b/app/views/shared/dialogs/_dialog_field_drop_down_list.html.haml deleted file mode 100644 index 3675d83dd85..00000000000 --- a/app/views/shared/dialogs/_dialog_field_drop_down_list.html.haml +++ /dev/null @@ -1,40 +0,0 @@ -- if edit - - select_values = field.values.collect(&:reverse) - - selected ||= wf.value(field.name) - = select_tag(field.name, options_for_select(select_values, - selected), - drop_down_options(field, url)) - - :javascript - dialogFieldRefresh.initializeDialogSelectPicker( - '#{field.name}', - '#{selected}', - '#{url}', - JSON.parse('#{j(auto_refresh_options.to_json)}') - ); - - - if field.dynamic - - if field.auto_refresh - - javascript_locals = {:auto_refresh_options => auto_refresh_options, - :refresh_field_parameters => {:type => field.type, - :name => field.name, - :id => field.id}} - - = render(:partial => "shared/dialogs/auto_refresh_javascript", :locals => javascript_locals) - - - if show_refresh_button - = button_tag(_('Refresh'), :id => "refresh-dynamic-field-#{field.id}", :class => "btn btn-default") - - :javascript - $('#refresh-dynamic-field-#{field.id}').click(function() { - var selectedValue = $('select[name="#{field.name}"]').val(); - dialogFieldRefresh.refreshDropDownList("#{field.name}", "#{field.id}", selectedValue, function() { - var jsonOptions = JSON.parse('#{j(auto_refresh_options.to_json)}'); - jsonOptions.initialTrigger = true; - - dialogFieldRefresh.triggerAutoRefresh(jsonOptions); - }); - }); - -- else - = h(field.value.nil? ? "" : dialog_dropdown_selected_value(field)) diff --git a/app/views/shared/dialogs/_dialog_field_radio_button.html.haml b/app/views/shared/dialogs/_dialog_field_radio_button.html.haml deleted file mode 100644 index e51819f742f..00000000000 --- a/app/views/shared/dialogs/_dialog_field_radio_button.html.haml +++ /dev/null @@ -1,50 +0,0 @@ -- if edit - - if field.values.length > 1 - %span{:id => "dynamic-radio-#{field.id}"} - - field.values.each do |rb| - - %input{radio_options(field, url, rb[0], wf.value(field.name))} - %label.dynamic-radio-label= rb[1] - - :javascript - dialogFieldRefresh.initializeRadioButtonOnClick( - '#{field.id}', - '#{url}', - JSON.parse('#{j(auto_refresh_options.to_json)}') - ); - - - else - = h(field.values[0].last) unless field.values.empty? - -- else - = h(field.values.detect { |k, _v| k == wf.value(field.name) }.try(:last) || wf.value(field.name)) - -- if field.dynamic - - if field.auto_refresh - - javascript_locals = {:auto_refresh_options => auto_refresh_options, - :refresh_field_parameters => {:type => field.type, - :name => field.name, - :id => field.id, - :url => url, - :auto_refresh_options => auto_refresh_options}} - - = render(:partial => "shared/dialogs/auto_refresh_javascript", :locals => javascript_locals) - - - if show_refresh_button - = button_tag(_('Refresh'), :id => "refresh-dynamic-field-#{field.id}", :class => "btn btn-default") - - :javascript - $('#refresh-dynamic-field-#{field.id}').click(function() { - var checkedValue = $('input:radio[name="#{field.name}"]:checked').val(); - - dialogFieldRefresh.refreshRadioList("#{field.name}", - "#{field.id}", - checkedValue, - "#{url}", - JSON.parse('#{j(auto_refresh_options.to_json)}'), function() { - var jsonOptions = JSON.parse('#{j(auto_refresh_options.to_json)}'); - jsonOptions.initialTrigger = true; - - dialogFieldRefresh.triggerAutoRefresh(jsonOptions); - }); - }); diff --git a/app/views/shared/dialogs/_dialog_field_text_area_box.html.haml b/app/views/shared/dialogs/_dialog_field_text_area_box.html.haml deleted file mode 100644 index 3e1157146f4..00000000000 --- a/app/views/shared/dialogs/_dialog_field_text_area_box.html.haml +++ /dev/null @@ -1,26 +0,0 @@ -- if edit - = text_area_tag(field.name, field.value, textarea_tag_options(field, url, auto_refresh_options.merge(:initial_trigger => true))) -- else - = h(field.value) - -- if field.dynamic - - if field.auto_refresh - - javascript_locals = {:auto_refresh_options => auto_refresh_options, - :refresh_field_parameters => {:type => field.type, - :name => field.name, - :id => field.id}} - - = render(:partial => "shared/dialogs/auto_refresh_javascript", :locals => javascript_locals) - - - if show_refresh_button - = button_tag(_('Refresh'), :id => "refresh-dynamic-text-field-#{field.id}", :class => "btn btn-default") - - :javascript - $('#refresh-dynamic-text-field-#{field.id}').click(function() { - dialogFieldRefresh.refreshTextAreaBox("#{field.name}", "#{field.id}", function() { - var jsonOptions = JSON.parse('#{j(auto_refresh_options.to_json)}'); - jsonOptions.initialTrigger = true; - - dialogFieldRefresh.triggerAutoRefresh(jsonOptions); - }); - }); diff --git a/app/views/shared/dialogs/_dialog_field_text_box.html.haml b/app/views/shared/dialogs/_dialog_field_text_box.html.haml deleted file mode 100644 index 778ad8f2eb4..00000000000 --- a/app/views/shared/dialogs/_dialog_field_text_box.html.haml +++ /dev/null @@ -1,33 +0,0 @@ -- if edit - - if field.protected? - = password_field_tag(field.name + "__protected", field.value, textbox_tag_options(field, url, auto_refresh_options.merge(:initial_trigger => true))) - - else - = text_field_tag(field.name, field.value, textbox_tag_options(field, url, auto_refresh_options.merge(:initial_trigger => true))) - - - if field.dynamic - - if field.auto_refresh - - javascript_locals = {:auto_refresh_options => auto_refresh_options, - :refresh_field_parameters => {:type => field.type, - :name => field.name, - :id => field.id}} - - = render(:partial => "shared/dialogs/auto_refresh_javascript", :locals => javascript_locals) - - - if show_refresh_button - = button_tag(_('Refresh'), :id => "refresh-dynamic-text-field-#{field.id}", :class => "btn btn-default") - - :javascript - $('#refresh-dynamic-text-field-#{field.id}').click(function() { - dialogFieldRefresh.refreshTextBox("#{field.name}", "#{field.id}", function() { - var jsonOptions = JSON.parse('#{j(auto_refresh_options.to_json)}'); - jsonOptions.initialTrigger = true; - - dialogFieldRefresh.triggerAutoRefresh(jsonOptions); - }); - }); - -- else - - if field.protected? - ******** - - else - = h(field.value) diff --git a/app/views/shared/dialogs/_dialog_group.html.haml b/app/views/shared/dialogs/_dialog_group.html.haml deleted file mode 100644 index dc968430fc7..00000000000 --- a/app/views/shared/dialogs/_dialog_group.html.haml +++ /dev/null @@ -1,14 +0,0 @@ -%div{:id => "group_#{group.id}_div"} - %h3{:title => "#{group.description}"} - = group.label - - unless group.dialog_fields.empty? - .form-horizontal - - group.dialog_fields.each_with_index do |field, field_index| - = render :partial => "shared/dialogs/dialog_field", - :locals => {:wf => wf, - :field => field, - :field_index => field_index, - :group_index => group_index, - :tab_index => tab_index, - :auto_refreshable_field_indicies => auto_refreshable_field_indicies} - %hr diff --git a/app/views/shared/dialogs/_dialog_tab.html.haml b/app/views/shared/dialogs/_dialog_tab.html.haml deleted file mode 100644 index f987303f63b..00000000000 --- a/app/views/shared/dialogs/_dialog_tab.html.haml +++ /dev/null @@ -1,7 +0,0 @@ -- tab.dialog_groups.each_with_index do |group, group_index| - = render :partial => "shared/dialogs/dialog_group", - :locals => {:wf => wf, - :group => group, - :group_index => group_index, - :tab_index => tab_index, - :auto_refreshable_field_indicies => auto_refreshable_field_indicies} diff --git a/spec/views/shared/dialogs/_dialog_field_drop_down_list.html.haml_spec.rb b/spec/views/shared/dialogs/_dialog_field_drop_down_list.html.haml_spec.rb deleted file mode 100644 index 5df1c693800..00000000000 --- a/spec/views/shared/dialogs/_dialog_field_drop_down_list.html.haml_spec.rb +++ /dev/null @@ -1,18 +0,0 @@ -describe "shared/dialogs/dialog_field_drop_down_list.html.haml" do - context 'display field value' do - before do - @edit = false - attributes = {:values => [[nil, ""], %w(Value1 Desc1), %w(Value2 Desc2)]} - value = 'Value2' - @field = DialogFieldDropDownList.new(:id => 1, - :name => 'Options List Field', - :type => 'DialogFieldDropDownList', - :attributes => attributes, :value => value) - end - - it 'shows the display value for the dropdown field' do - render :partial => "/shared/dialogs/dialog_field_drop_down_list.html.haml", :locals => {:edit => @edit, :field => @field} - expect(rendered).to eq("Desc2\n") - end - end -end