From 96c52675597683ffc277f88edd9ec8b0a112ee9e Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Wed, 24 Feb 2021 05:48:01 +0000 Subject: [PATCH] Fixes issue #3276 - Software error when Elasticsearch is not configured and `rake searchindex:rebuild` --- app/assets/javascripts/app/controllers/_channel/form.coffee | 2 +- app/assets/javascripts/app/controllers/_channel/google.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_channel/form.coffee b/app/assets/javascripts/app/controllers/_channel/form.coffee index d7b1e880b..f687df6bd 100644 --- a/app/assets/javascripts/app/controllers/_channel/form.coffee +++ b/app/assets/javascripts/app/controllers/_channel/form.coffee @@ -88,4 +88,4 @@ class ChannelForm extends App.ControllerSubContent value = @paramsSetting.find('[name=group_id]').val() App.Setting.set('form_ticket_create_group_id', value) -App.Config.set('Form', { prio: 2000, name: 'Form', parent: '#channels', target: '#channels/form', controller: ChannelForm, permission: ['admin.formular'] }, 'NavBarAdmin') +App.Config.set('Form', { prio: 2000, name: 'Form', parent: '#channels', target: '#channels/form', controller: ChannelForm, permission: ['admin.channel_formular'] }, 'NavBarAdmin') diff --git a/app/assets/javascripts/app/controllers/_channel/google.coffee b/app/assets/javascripts/app/controllers/_channel/google.coffee index 6207b4aeb..d5eb44c4d 100644 --- 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_email' + requiredPermission: 'admin.channel_google' header: 'Google' constructor: -> super