Renamed miq_event related files to miq_event_definition for consistency

ManageIQ · Feb 5, 2021 · 399c972 · 399c972
1 parent 21b2da0
commit 399c972
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 12 deletions.
diff --git a/app/controllers/miq_event_controller.rb → ...ollers/miq_event_definition_controller.rb b/app/controllers/miq_event_controller.rb → ...ollers/miq_event_definition_controller.rb
@@ -1,4 +1,4 @@
-class MiqEventController < ApplicationController
+class MiqEventDefinitionController < ApplicationController
   before_action :check_privileges
   before_action :get_session_data
   after_action :cleanup_action
@@ -36,7 +36,7 @@ def init_show
 
   def get_session_data
     @title = _("Events")
-    @layout = "miq_event"
+    @layout = "miq_event_definition"
     @lastaction = session[:miq_event_lastaction]
     @display = session[:miq_event_display]
     @current_page = session[:miq_event_current_page]

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -390,8 +390,6 @@ def db_to_controller(db, action = "show")
     when "ScanItemSet"
       controller = "ops"
       action = "ap_show"
-    when "MiqEventDefinition"
-      controller = "miq_event"
     when "User", "Group", "Patch", "GuestApplication"
       controller = "vm"
       action = @lastaction

diff --git a/app/helpers/application_helper/page_layouts.rb b/app/helpers/application_helper/page_layouts.rb
@@ -27,7 +27,7 @@ def layout_uses_listnav?
       miq_ae_export
       miq_ae_logs
       miq_ae_tools
-      miq_event
+      miq_event_definition
       miq_policy
       miq_policy_export
       miq_policy_logs

diff --git a/app/views/miq_event/show.html.haml → ...views/miq_event_definition/show.html.haml b/app/views/miq_event/show.html.haml → ...views/miq_event_definition/show.html.haml
diff --git a/app/views/miq_event/show_list.html.haml → .../miq_event_definition/show_list.html.haml b/app/views/miq_event/show_list.html.haml → .../miq_event_definition/show_list.html.haml
diff --git a/config/routes.rb b/config/routes.rb
@@ -2181,14 +2181,11 @@
         x_post
     },
 
-    :miq_event => {
+    :miq_event_definition => {
       :get  => %w(
         show
         show_list
       ),
-      :post => %w(
-
-      )
     },
 
     :condition => {

diff --git a/product/views/MiqEvent.yaml → product/views/MiqEventDefinition.yaml b/product/views/MiqEvent.yaml → product/views/MiqEventDefinition.yaml
diff --git a/spec/config/routes.pending.yml b/spec/config/routes.pending.yml
@@ -814,7 +814,7 @@ MiqAlertSetController:
 - x_history
 - x_search_by_name
 - x_show
-MiqEventController:
+MiqEventDefinitionController:
 - index
 MiqPolicyController:
 - adv_search_button

diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
@@ -388,13 +388,13 @@
 
       it "and @explorer" do
         @explorer = true
-        expect(subject[0]).to eq("event")
+        expect(subject[0]).to eq("miq_event_definition")
         expect(subject[1]).to eq("_none_")
       end
 
       it "and not @explorer" do
         @explorer = nil
-        expect(subject[0]).to eq("event")
+        expect(subject[0]).to eq("miq_event_definition")
         expect(subject[1]).to eq("_none_")
       end
     end