From 8894374afda9477cde17873191f0a74190576525 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Fri, 13 Oct 2017 08:22:37 +0200 Subject: [PATCH] Fixed typo in permission name. --- app/assets/javascripts/app/controllers/_channel/chat.coffee | 2 +- app/assets/javascripts/app/controllers/_channel/form.coffee | 1 - app/controllers/chats_controller.rb | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_channel/chat.coffee b/app/assets/javascripts/app/controllers/_channel/chat.coffee index a1cb273cb..4745483a4 100644 --- a/app/assets/javascripts/app/controllers/_channel/chat.coffee +++ b/app/assets/javascripts/app/controllers/_channel/chat.coffee @@ -363,7 +363,7 @@ class App.ChannelChat extends App.ControllerSubContent @code.each (i, block) -> hljs.highlightBlock block -App.Config.set('Chat', { prio: 4000, name: 'Chat', parent: '#channels', target: '#channels/chat', controller: App.ChannelChat, permission: ['admin.chat'] }, 'NavBarAdmin') +App.Config.set('Chat', { prio: 4000, name: 'Chat', parent: '#channels', target: '#channels/chat', controller: App.ChannelChat, permission: ['admin.channel_chat'] }, 'NavBarAdmin') class Topics extends App.Controller events: diff --git a/app/assets/javascripts/app/controllers/_channel/form.coffee b/app/assets/javascripts/app/controllers/_channel/form.coffee index 7efd8168b..96cca32d3 100644 --- a/app/assets/javascripts/app/controllers/_channel/form.coffee +++ b/app/assets/javascripts/app/controllers/_channel/form.coffee @@ -38,7 +38,6 @@ class App.ChannelForm extends App.ControllerSubContent value: group_id #class: 'form-control--small' ) - console.log('s', element.find('.js-groupSelector'), selection) element.find('.js-groupSelector').html(selection) @html element diff --git a/app/controllers/chats_controller.rb b/app/controllers/chats_controller.rb index 20b61d3e7..6eb0bf2c7 100644 --- a/app/controllers/chats_controller.rb +++ b/app/controllers/chats_controller.rb @@ -1,7 +1,7 @@ # Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/ class ChatsController < ApplicationController - prepend_before_action { authentication_check(permission: 'admin.chat') } + prepend_before_action { authentication_check(permission: 'admin.channel_chat') } def index chat_ids = []