Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed typo in permission name.

Browse source
This commit is contained in:
Martin Edenhofer 2017-10-13 08:22:37 +02:00
parent 8dcb17627c
commit 8894374afd
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/_channel/chat.coffee
View file

@ -363,7 +363,7 @@ class App.ChannelChat extends App.ControllerSubContent
@code.each (i, block) -> @code.each (i, block) ->
hljs.highlightBlock 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 class Topics extends App.Controller
events: events:

1
app/assets/javascripts/app/controllers/_channel/form.coffee
View file

@ -38,7 +38,6 @@ class App.ChannelForm extends App.ControllerSubContent
value: group_id value: group_id
#class: 'form-control--small' #class: 'form-control--small'
) )
console.log('s', element.find('.js-groupSelector'), selection)
element.find('.js-groupSelector').html(selection) element.find('.js-groupSelector').html(selection)
@html element @html element

2
app/controllers/chats_controller.rb
View file

@ -1,7 +1,7 @@
# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/ # Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/
class ChatsController < ApplicationController class ChatsController < ApplicationController
prepend_before_action { authentication_check(permission: 'admin.chat') } prepend_before_action { authentication_check(permission: 'admin.channel_chat') }
def index def index
chat_ids = [] chat_ids = []