Fixes zammad#4574 - Admin user can not find user or organization in t…

…he search bar.
monotek · Apr 19, 2023 · 002c5cb · 002c5cb
1 parent ef5172e
commit 002c5cb
Show file tree

Hide file tree

Showing 74 changed files with 182 additions and 75 deletions.
diff --git a/app/assets/javascripts/app/controllers/_channel/chat.coffee b/app/assets/javascripts/app/controllers/_channel/chat.coffee
@@ -1,5 +1,5 @@
 class ChannelChat extends App.ControllerSubContent
-  requiredPermission: 'admin.channel_chat'
+  @requiredPermission: 'admin.channel_chat'
   header: __('Chat')
   events:
     'change .js-params': 'updateParams'

diff --git a/app/assets/javascripts/app/controllers/_channel/email.coffee b/app/assets/javascripts/app/controllers/_channel/email.coffee
@@ -1,5 +1,5 @@
 class ChannelEmail extends App.ControllerTabs
-  requiredPermission: 'admin.channel_email'
+  @requiredPermission: 'admin.channel_email'
   header: __('Email')
   constructor: ->
     super

diff --git a/app/assets/javascripts/app/controllers/_channel/facebook.coffee b/app/assets/javascripts/app/controllers/_channel/facebook.coffee
@@ -1,5 +1,5 @@
 class ChannelFacebook extends App.ControllerSubContent
-  requiredPermission: 'admin.channel_facebook'
+  @requiredPermission: 'admin.channel_facebook'
   header: __('Facebook')
   events:
     'click .js-new':       'new'

diff --git a/app/assets/javascripts/app/controllers/_channel/form.coffee b/app/assets/javascripts/app/controllers/_channel/form.coffee
@@ -1,6 +1,6 @@
 # coffeelint: disable=no_unnecessary_double_quotes
 class ChannelForm extends App.ControllerSubContent
-  requiredPermission: 'admin.channel_formular'
+  @requiredPermission: 'admin.channel_formular'
   header: __('Form')
   events:
     'change form.js-paramsDesigner': 'updateParamsDesigner'

diff --git a/app/assets/javascripts/app/controllers/_channel/google.coffee b/app/assets/javascripts/app/controllers/_channel/google.coffee
@@ -1,5 +1,5 @@
 class App.ChannelGoogle extends App.ControllerTabs
-  requiredPermission: 'admin.channel_google'
+  @requiredPermission: 'admin.channel_google'
   header: __('Google')
   constructor: ->
     super
@@ -33,7 +33,7 @@ class App.ChannelGoogle extends App.ControllerTabs
     @render()
 
 class ChannelAccountOverview extends App.ControllerSubContent
-  requiredPermission: 'admin.channel_google'
+  @requiredPermission: 'admin.channel_google'
   events:
     'click .js-new':                'new'
     'click .js-delete':             'delete'

diff --git a/app/assets/javascripts/app/controllers/_channel/microsoft365.coffee b/app/assets/javascripts/app/controllers/_channel/microsoft365.coffee
@@ -1,5 +1,5 @@
 class App.ChannelMicrosoft365 extends App.ControllerTabs
-  requiredPermission: 'admin.channel_microsoft365'
+  @requiredPermission: 'admin.channel_microsoft365'
   header: __('Microsoft 365')
   constructor: ->
     super
@@ -33,7 +33,7 @@ class App.ChannelMicrosoft365 extends App.ControllerTabs
     @render()
 
 class ChannelAccountOverview extends App.ControllerSubContent
-  requiredPermission: 'admin.channel_microsoft365'
+  @requiredPermission: 'admin.channel_microsoft365'
   events:
     'click .js-new':                'new'
     'click .js-admin-consent':      'adminConsent'

diff --git a/app/assets/javascripts/app/controllers/_channel/sms.coffee b/app/assets/javascripts/app/controllers/_channel/sms.coffee
@@ -1,5 +1,5 @@
 class ChannelSms extends App.ControllerTabs
-  requiredPermission: 'admin.channel_sms'
+  @requiredPermission: 'admin.channel_sms'
   header: __('SMS')
   constructor: ->
     super

diff --git a/app/assets/javascripts/app/controllers/_channel/telegram.coffee b/app/assets/javascripts/app/controllers/_channel/telegram.coffee
@@ -1,5 +1,5 @@
 class ChannelTelegram extends App.ControllerSubContent
-  requiredPermission: 'admin.channel_telegram'
+  @requiredPermission: 'admin.channel_telegram'
   events:
     'click .js-new':     'new'
     'click .js-edit':    'edit'

diff --git a/app/assets/javascripts/app/controllers/_channel/twitter.coffee b/app/assets/javascripts/app/controllers/_channel/twitter.coffee
@@ -1,5 +1,5 @@
 class ChannelTwitter extends App.ControllerSubContent
-  requiredPermission: 'admin.channel_twitter'
+  @requiredPermission: 'admin.channel_twitter'
   events:
     'click .js-new':       'new'
     'click .js-edit':      'edit'

diff --git a/app/assets/javascripts/app/controllers/_channel/web.coffee b/app/assets/javascripts/app/controllers/_channel/web.coffee
@@ -1,5 +1,5 @@
 class ChannelWeb extends App.ControllerTabs
-  requiredPermission: 'admin.channel_web'
+  @requiredPermission: 'admin.channel_web'
   header: __('Web')
   constructor: ->
     super

diff --git a/app/assets/javascripts/app/controllers/_manage/branding.coffee b/app/assets/javascripts/app/controllers/_manage/branding.coffee
@@ -1,5 +1,5 @@
 class Branding extends App.ControllerTabs
-  requiredPermission: 'admin.branding'
+  @requiredPermission: 'admin.branding'
   header: __('Branding')
   constructor: ->
     super

diff --git a/app/assets/javascripts/app/controllers/_manage/security.coffee b/app/assets/javascripts/app/controllers/_manage/security.coffee
@@ -1,5 +1,5 @@
 class Security extends App.ControllerTabs
-  requiredPermission: 'admin.security'
+  @requiredPermission: 'admin.security'
   header: __('Security')
   constructor: ->
     super

diff --git a/app/assets/javascripts/app/controllers/_manage/system.coffee b/app/assets/javascripts/app/controllers/_manage/system.coffee
@@ -1,5 +1,5 @@
 class System extends App.ControllerTabs
-  requiredPermission: 'admin.setting_system'
+  @requiredPermission: 'admin.setting_system'
   header: __('System')
   constructor: ->
     super

diff --git a/app/assets/javascripts/app/controllers/_manage/ticket.coffee b/app/assets/javascripts/app/controllers/_manage/ticket.coffee
@@ -1,5 +1,5 @@
 class Ticket extends App.ControllerTabs
-  requiredPermission: 'admin.ticket'
+  @requiredPermission: 'admin.ticket'
   header: __('Ticket')
   constructor: ->
     super

diff --git a/app/assets/javascripts/app/controllers/_manage/ticket_auto_assignment.coffee b/app/assets/javascripts/app/controllers/_manage/ticket_auto_assignment.coffee
@@ -1,5 +1,5 @@
 class App.SettingTicketAutoAssignment extends App.ControllerSubContent
-  requiredPermission: 'admin.ticket_auto_assignment'
+  @requiredPermission: 'admin.ticket_auto_assignment'
   events:
     'change .js-ticketAutoAssignment input': 'setTicketAutoAssignment'
     'click .js-timeAccountingFilter': 'setFilter'

diff --git a/app/assets/javascripts/app/controllers/_profile/appearance.coffee b/app/assets/javascripts/app/controllers/_profile/appearance.coffee
@@ -1,5 +1,5 @@
 class ProfileAppearance extends App.ControllerSubContent
-  requiredPermission: 'user_preferences.appearance'
+  @requiredPermission: 'user_preferences.appearance'
   header: __('Appearance')
   events:
     'change input[name="theme"]': 'updateTheme'

diff --git a/app/assets/javascripts/app/controllers/_profile/avatar.coffee b/app/assets/javascripts/app/controllers/_profile/avatar.coffee
@@ -1,5 +1,5 @@
 class ProfileAvatar extends App.ControllerSubContent
-  requiredPermission: 'user_preferences.avatar'
+  @requiredPermission: 'user_preferences.avatar'
   header: __('Avatar')
   elements:
     '.js-upload':      'fileInput'

diff --git a/app/assets/javascripts/app/controllers/_profile/calendar_subscriptions.coffee b/app/assets/javascripts/app/controllers/_profile/calendar_subscriptions.coffee
@@ -1,5 +1,5 @@
 class ProfileCalendarSubscriptions extends App.ControllerSubContent
-  requiredPermission: 'user_preferences.calendar+ticket.agent'
+  @requiredPermission: 'user_preferences.calendar+ticket.agent'
   header: __('Calendar')
   elements:
     'input[type=checkbox]': 'options'

diff --git a/app/assets/javascripts/app/controllers/_profile/devices.coffee b/app/assets/javascripts/app/controllers/_profile/devices.coffee
@@ -1,5 +1,5 @@
 class ProfileDevices extends App.ControllerSubContent
-  requiredPermission: 'user_preferences.device'
+  @requiredPermission: 'user_preferences.device'
   header: __('Devices')
   events:
     'click [data-type=delete]': 'delete'

diff --git a/app/assets/javascripts/app/controllers/_profile/language.coffee b/app/assets/javascripts/app/controllers/_profile/language.coffee
@@ -1,5 +1,5 @@
 class ProfileLanguage extends App.ControllerSubContent
-  requiredPermission: 'user_preferences.language'
+  @requiredPermission: 'user_preferences.language'
   header: __('Language')
   events:
     'submit form': 'update'

diff --git a/app/assets/javascripts/app/controllers/_profile/linked_accounts.coffee b/app/assets/javascripts/app/controllers/_profile/linked_accounts.coffee
@@ -1,5 +1,5 @@
 class ProfileLinkedAccounts extends App.ControllerSubContent
-  requiredPermission: 'user_preferences.linked_accounts'
+  @requiredPermission: 'user_preferences.linked_accounts'
   header: __('Linked Accounts')
   events:
     'click .js-add':    'add'

diff --git a/app/assets/javascripts/app/controllers/_profile/notification.coffee b/app/assets/javascripts/app/controllers/_profile/notification.coffee
@@ -1,5 +1,5 @@
 class ProfileNotification extends App.ControllerSubContent
-  requiredPermission: 'user_preferences.notifications+ticket.agent'
+  @requiredPermission: 'user_preferences.notifications+ticket.agent'
   header: __('Notifications')
   events:
     'submit form': 'update'

diff --git a/app/assets/javascripts/app/controllers/_profile/out_of_office.coffee b/app/assets/javascripts/app/controllers/_profile/out_of_office.coffee
@@ -1,5 +1,5 @@
 class ProfileOutOfOffice extends App.ControllerSubContent
-  requiredPermission: 'user_preferences.out_of_office+ticket.agent'
+  @requiredPermission: 'user_preferences.out_of_office+ticket.agent'
   header: __('Out of Office')
   events:
     'submit form': 'submit'

diff --git a/app/assets/javascripts/app/controllers/_profile/overviews.coffee b/app/assets/javascripts/app/controllers/_profile/overviews.coffee
@@ -1,5 +1,5 @@
 class Overviews extends App.ControllerSubContent
-  requiredPermission: 'user_preferences.overview_sorting'
+  @requiredPermission: 'user_preferences.overview_sorting'
   header: __('Order of Overviews')
 
   constructor: ->

diff --git a/app/assets/javascripts/app/controllers/_profile/password.coffee b/app/assets/javascripts/app/controllers/_profile/password.coffee
@@ -1,5 +1,5 @@
 class ProfilePassword extends App.ControllerSubContent
-  requiredPermission: 'user_preferences.password'
+  @requiredPermission: 'user_preferences.password'
   header: __('Password')
   events:
     'submit form': 'update'

diff --git a/app/assets/javascripts/app/controllers/_profile/token_access.coffee b/app/assets/javascripts/app/controllers/_profile/token_access.coffee
@@ -1,5 +1,5 @@
 class ProfileTokenAccess extends App.ControllerSubContent
-  requiredPermission: 'user_preferences.access_token'
+  @requiredPermission: 'user_preferences.access_token'
   header: __('Token Access')
   events:
     'click .js-delete': 'delete'

diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create.coffee
@@ -746,7 +746,7 @@ class App.TicketCreate extends App.Controller
     @formEnable(@$('.js-submit'), 'button')
 
 class Router extends App.ControllerPermanent
-  requiredPermission: 'ticket.agent'
+  @requiredPermission: 'ticket.agent'
   constructor: (params) ->
     super
 

diff --git a/app/assets/javascripts/app/controllers/api.coffee b/app/assets/javascripts/app/controllers/api.coffee
@@ -1,5 +1,5 @@
 class Api extends App.ControllerSubContent
-  requiredPermission: 'admin.api'
+  @requiredPermission: 'admin.api'
   header: __('API')
   events:
     'click .action':  'action'

diff --git a/app/assets/javascripts/app/controllers/calendar.coffee b/app/assets/javascripts/app/controllers/calendar.coffee
@@ -1,5 +1,5 @@
 class Calendar extends App.ControllerSubContent
-  requiredPermission: 'admin.calendar'
+  @requiredPermission: 'admin.calendar'
   header: __('Calendars')
   events:
     'click .js-new':         'new'

diff --git a/app/assets/javascripts/app/controllers/chat.coffee b/app/assets/javascripts/app/controllers/chat.coffee
@@ -934,7 +934,7 @@ class Setting extends App.ControllerModal
     )
 
 class CustomerChatRouter extends App.ControllerPermanent
-  requiredPermission: 'chat.agent'
+  @requiredPermission: 'chat.agent'
   constructor: (params) ->
     super
 

diff --git a/app/assets/javascripts/app/controllers/core_workflow.coffee b/app/assets/javascripts/app/controllers/core_workflow.coffee
@@ -1,5 +1,5 @@
 class CoreWorkflow extends App.ControllerSubContent
-  requiredPermission: 'admin.core_workflow'
+  @requiredPermission: 'admin.core_workflow'
   header: __('Core Workflows')
   constructor: ->
     super

diff --git a/app/assets/javascripts/app/controllers/cti.coffee b/app/assets/javascripts/app/controllers/cti.coffee
@@ -305,7 +305,7 @@ class WidgetAvatar extends App.ControllerObserver
     @renderPopovers()
 
 class CTIRouter extends App.ControllerPermanent
-  requiredPermission: 'cti.agent'
+  @requiredPermission: 'cti.agent'
   constructor: (params) ->
     super
 

diff --git a/app/assets/javascripts/app/controllers/customer_ticket_create.coffee b/app/assets/javascripts/app/controllers/customer_ticket_create.coffee
@@ -1,5 +1,5 @@
 class CustomerTicketCreate extends App.ControllerAppContent
-  requiredPermission: 'ticket.customer'
+  @requiredPermission: 'ticket.customer'
   events:
     'submit form':         'submit',
     'click .submit':       'submit',

diff --git a/app/assets/javascripts/app/controllers/dashboard.coffee b/app/assets/javascripts/app/controllers/dashboard.coffee
@@ -97,7 +97,7 @@ class App.Dashboard extends App.Controller
     @$(".tab-content.#{target}").removeClass('hidden')
 
 class DashboardRouter extends App.ControllerPermanent
-  requiredPermission: ['*']
+  @requiredPermission: ['*']
 
   constructor: (params) ->
     super

diff --git a/app/assets/javascripts/app/controllers/data_privacy.coffee b/app/assets/javascripts/app/controllers/data_privacy.coffee
@@ -1,5 +1,5 @@
 class Index extends App.ControllerSubContent
-  requiredPermission: 'admin.data_privacy'
+  @requiredPermission: 'admin.data_privacy'
   header: __('Data Privacy')
   events:
     'click .js-new':         'new'

diff --git a/app/assets/javascripts/app/controllers/group.coffee b/app/assets/javascripts/app/controllers/group.coffee
@@ -1,5 +1,5 @@
 class Group extends App.ControllerSubContent
-  requiredPermission: 'admin.group'
+  @requiredPermission: 'admin.group'
   header: __('Groups')
   constructor: ->
     super

diff --git a/app/assets/javascripts/app/controllers/integrations.coffee b/app/assets/javascripts/app/controllers/integrations.coffee
@@ -1,5 +1,5 @@
 class Integrations extends App.ControllerSubContent
-  requiredPermission: 'admin.integration'
+  @requiredPermission: 'admin.integration'
   header: __('Integrations')
   constructor: ->
     super

diff --git a/app/assets/javascripts/app/controllers/job.coffee b/app/assets/javascripts/app/controllers/job.coffee
@@ -1,5 +1,5 @@
 class Job extends App.ControllerSubContent
-  requiredPermission: 'admin.scheduler'
+  @requiredPermission: 'admin.scheduler'
   header: __('Scheduler')
   constructor: ->
     super

diff --git a/app/assets/javascripts/app/controllers/knowledge_base/router.coffee b/app/assets/javascripts/app/controllers/knowledge_base/router.coffee
@@ -1,5 +1,5 @@
 class Router extends App.ControllerPermanent
-  requiredPermission: 'knowledge_base.*'
+  @requiredPermission: 'knowledge_base.*'
 
   constructor: (params) ->
     super

diff --git a/app/assets/javascripts/app/controllers/macro.coffee b/app/assets/javascripts/app/controllers/macro.coffee
@@ -1,5 +1,5 @@
 class Macro extends App.ControllerSubContent
-  requiredPermission: 'admin.macro'
+  @requiredPermission: 'admin.macro'
   header: __('Macros')
   constructor: ->
     super

diff --git a/app/assets/javascripts/app/controllers/maintenance.coffee b/app/assets/javascripts/app/controllers/maintenance.coffee
@@ -1,5 +1,5 @@
 class Maintenance extends App.ControllerSubContent
-  requiredPermission: 'admin.maintenance'
+  @requiredPermission: 'admin.maintenance'
   header: __('Maintenance')
   events:
     'change .js-modeSetting input': 'setMode'

diff --git a/app/assets/javascripts/app/controllers/manage.coffee b/app/assets/javascripts/app/controllers/manage.coffee
@@ -3,7 +3,7 @@ class App.Manage extends App.ControllerNavSidbar
   configKey: 'NavBarAdmin'
 
 class ManageRouter extends App.ControllerPermanent
-  requiredPermission: ['admin.*']
+  @requiredPermission: ['admin.*']
 
   constructor: (params) ->
     super

diff --git a/app/assets/javascripts/app/controllers/monitoring.coffee b/app/assets/javascripts/app/controllers/monitoring.coffee
@@ -1,5 +1,5 @@
 class Monitoring extends App.ControllerSubContent
-  requiredPermission: 'admin.monitoring'
+  @requiredPermission: 'admin.monitoring'
   header: __('Monitoring')
   events:
     'click .js-resetToken': 'resetToken'

diff --git a/app/assets/javascripts/app/controllers/object_manager.coffee b/app/assets/javascripts/app/controllers/object_manager.coffee
@@ -75,7 +75,7 @@ customsortDataOptions = ({target}, params) ->
   params
 
 class ObjectManager extends App.ControllerTabs
-  requiredPermission: 'admin.object'
+  @requiredPermission: 'admin.object'
   constructor: ->
     super
 

diff --git a/app/assets/javascripts/app/controllers/organization.coffee b/app/assets/javascripts/app/controllers/organization.coffee
@@ -1,5 +1,5 @@
 class Organization extends App.ControllerSubContent
-  requiredPermission: 'admin.organization'
+  @requiredPermission: 'admin.organization'
   header: __('Organizations')
   constructor: ->
     super

diff --git a/app/assets/javascripts/app/controllers/organization_profile.coffee b/app/assets/javascripts/app/controllers/organization_profile.coffee
@@ -77,7 +77,8 @@ class App.OrganizationProfile extends App.Controller
     @$('.profile').scrollTop()
 
 class Router extends App.ControllerPermanent
-  requiredPermission: 'ticket.agent'
+  @requiredPermission: ['ticket.agent', 'admin.organization']
+
   constructor: (params) ->
     super
 

diff --git a/app/assets/javascripts/app/controllers/overview.coffee b/app/assets/javascripts/app/controllers/overview.coffee
@@ -1,5 +1,5 @@
 class Overview extends App.ControllerSubContent
-  requiredPermission: 'admin.overview'
+  @requiredPermission: 'admin.overview'
   header: __('Overviews')
   constructor: ->
     super

diff --git a/app/assets/javascripts/app/controllers/package.coffee b/app/assets/javascripts/app/controllers/package.coffee
@@ -1,5 +1,5 @@
 class Package extends App.ControllerSubContent
-  requiredPermission: 'admin.package'
+  @requiredPermission: 'admin.package'
   header: __('Packages')
   events:
     'click .package-action[data-type="uninstall"]':  'action'

diff --git a/app/assets/javascripts/app/controllers/profile.coffee b/app/assets/javascripts/app/controllers/profile.coffee
@@ -12,7 +12,7 @@ class App.Profile extends App.ControllerNavSidbar
     )
 
 class ProfileRouter extends App.ControllerPermanent
-  requiredPermission: ['user_preferences.*']
+  @requiredPermission: ['user_preferences.*']
 
   constructor: (params) ->
     super

diff --git a/app/assets/javascripts/app/controllers/public_link.coffee b/app/assets/javascripts/app/controllers/public_link.coffee
@@ -1,5 +1,5 @@
 class PublicLink extends App.ControllerSubContent
-  requiredPermission: 'admin.public_link'
+  @requiredPermission: 'admin.public_link'
   header: __('Public Links')
   constructor: ->
     super

diff --git a/app/assets/javascripts/app/controllers/report.coffee b/app/assets/javascripts/app/controllers/report.coffee
@@ -1,5 +1,5 @@
 class Reporting extends App.ControllerAppContent
-  requiredPermission: 'report'
+  @requiredPermission: 'report'
 
   constructor: ->
     super

diff --git a/app/assets/javascripts/app/controllers/report_profile.coffee b/app/assets/javascripts/app/controllers/report_profile.coffee
@@ -1,5 +1,5 @@
 class ReportProfile extends App.ControllerSubContent
-  requiredPermission: 'admin.report_profile'
+  @requiredPermission: 'admin.report_profile'
   header: __('Report Profile')
   constructor: ->
     super