diff --git a/.rubocop.yml b/.rubocop.yml index e3a0b7ace..4914ebed6 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -271,7 +271,5 @@ Lint/Eval: Enabled: false Rails/HasAndBelongsToMany: Enabled: false -Style/MethodName: - Enabled: false Style/ModuleFunction: Enabled: false diff --git a/app/controllers/object_manager_attributes_controller.rb b/app/controllers/object_manager_attributes_controller.rb index 60a372b64..7e61985c5 100644 --- a/app/controllers/object_manager_attributes_controller.rb +++ b/app/controllers/object_manager_attributes_controller.rb @@ -7,7 +7,7 @@ class ObjectManagerAttributesController < ApplicationController def list return if deny_if_not_role(Z_ROLENAME_ADMIN) render json: { - objects: ObjectManager.listFrontendObjects, + objects: ObjectManager.list_frontend_objects, } #model_index_render(ObjectManager::Attribute, params) end diff --git a/app/models/object_manager.rb b/app/models/object_manager.rb index 187343c15..5fcfc773c 100644 --- a/app/models/object_manager.rb +++ b/app/models/object_manager.rb @@ -6,11 +6,11 @@ class ObjectManager list all backend managed object - ObjectManager.listObjects() + ObjectManager.list_objects() =end - def self.listObjects + def self.list_objects ['Ticket', 'TicketArticle', 'User', 'Organization', 'Group' ] end @@ -18,11 +18,11 @@ list all backend managed object list all frontend managed object - ObjectManager.listFrontendObjects() + ObjectManager.list_frontend_objects() =end - def self.listFrontendObjects + def self.list_frontend_objects ['Ticket', 'User', 'Organization' ] #, 'Group' ] end diff --git a/lib/session_helper.rb b/lib/session_helper.rb index 6df31f078..c02c794f2 100644 --- a/lib/session_helper.rb +++ b/lib/session_helper.rb @@ -18,7 +18,7 @@ module SessionHelper def self.models(user = nil) models = {} - objects = ObjectManager.listObjects + objects = ObjectManager.list_objects objects.each {|object| attributes = ObjectManager::Attribute.by_object(object, user) models[object] = attributes