Revert "Revert "Trying to get the reconfigure page working""

This reverts commit 3317242.
ManageIQ · Sep 9, 2022 · fdacbec · fdacbec
1 parent 3317242
commit fdacbec
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 8 deletions.
diff --git a/app/controllers/service_controller.rb b/app/controllers/service_controller.rb
@@ -60,16 +60,30 @@ def edit
     drop_breadcrumb(:name => _("Edit Service\"%{name}\"") % {:name => @service.name}, :url => "/service/edit/#{@service.id}")
   end
 
-  def service_reconfigure
+  def reconfigure_dialog
     service = Service.find_by(:id => params[:id])
     service_template = ServiceTemplate.find_by(:id => service.service_template_id)
-    resource_action = service_template.resource_actions.find_by(:action => 'Reconfigure') if service_template
+    #resource_action = service_template.resource_actions.find_by(:action => 'Reconfigure') if service_template
+    resource_action = service_template.resource_actions.first
     dialog_locals = {:resource_action_id => resource_action.id, :target_id => service.id}
     @resource_action_id = resource_action.id
     @target_id = service.id
     @angular_form = true
     @in_a_form = true
     drop_breadcrumb(:name => _("Reconfigure Service\"%{name}\"") % {:name => service.name})
+  end
+
+  def service_reconfigure
+    service = Service.find_by(:id => params[:id])
+    # service_template = ServiceTemplate.find_by(:id => service.service_template_id)
+    # #resource_action = service_template.resource_actions.find_by(:action => 'Reconfigure') if service_template
+    # resource_action = service_template.resource_actions.first
+    # dialog_locals = {:resource_action_id => resource_action.id, :target_id => service.id}
+    # @resource_action_id = resource_action.id
+    # @target_id = service.id
+    # @angular_form = true
+    # @in_a_form = true
+    drop_breadcrumb(:name => _("Reconfigure Service\"%{name}\"") % {:name => service.name})
     javascript_redirect(:action => 'reconfigure_dialog', :id => checked_item_id)
   end
 
@@ -210,6 +224,8 @@ def set_right_cell_vars(action)
       partial = "shared/dialogs/reconfigure_dialog"
       header = @right_cell_text
       action = nil
+      puts "params=====#{params.inspect}"
+      locals = params[:dialog_locals]
     when "service_edit"
       partial = "service_form"
       header = _("Editing Service \"%{name}\"") % {:name => @service.name}
@@ -221,6 +237,7 @@ def set_right_cell_vars(action)
     else
       action = nil
     end
+    locals ||= {}
     return partial, action, header
   end
 

diff --git a/app/helpers/application_helper/toolbar/service_center.rb b/app/helpers/application_helper/toolbar/service_center.rb
@@ -40,8 +40,8 @@ class ApplicationHelper::Toolbar::ServiceCenter < ApplicationHelper::Toolbar::Ba
                        'pficon pficon-edit fa-lg',
                        N_('Reconfigure the options of this Service'),
                        N_('Reconfigure this Service'),
-                       :klass   => ApplicationHelper::Button::GenericFeatureButton,
-                       :options => {:feature => :reconfigure}
+                       #:klass   => ApplicationHelper::Button::GenericFeatureButton,
+                       #:options => {:feature => :reconfigure}
                      ),
                    ]
                  ),

diff --git a/app/javascript/oldjs/controllers/dialog_user/dialog_user_reconfigure_controller.js b/app/javascript/oldjs/controllers/dialog_user/dialog_user_reconfigure_controller.js
@@ -13,8 +13,10 @@ ManageIQ.angular.app.controller('dialogUserReconfigureController', ['API', 'dial
   };
 
   function init(data) {
-    vm.dialogId = data.reconfigure_dialog[0].id;
-    vm.dialog = data.reconfigure_dialog[0];
+    if(data.reconfigure_dialog) {
+      vm.dialogId = data.reconfigure_dialog[0].id;
+      vm.dialog = data.reconfigure_dialog[0];
+    }
     vm.dialogLoaded = true;
   }
 

diff --git a/app/views/service/_reconfigure_form.html.haml b/app/views/service/_reconfigure_form.html.haml
@@ -1,3 +1,4 @@
+= resource_action_id
 #main_div
   .row.wrapper{"ng-controller" => "dialogUserReconfigureController as vm"}
     .spinner{'ng-show' => "!vm.dialogLoaded"}
@@ -20,6 +21,6 @@
                     'on-click' => "vm.cancelClicked($event)"}
 
   :javascript
-    ManageIQ.angular.app.value('resourceActionId', '#{resource_action_id}');
-    ManageIQ.angular.app.value('targetId', '#{target_id}');
+    ManageIQ.angular.app.value('resourceActionId', #{ resource_action_id });
+    ManageIQ.angular.app.value('targetId', #{ target_id });
     miq_bootstrap('.wrapper');