Merge pull request #5459 from svbergerem/aspect-chat-control-disabled-chat

Only show aspect chat control if chat is enabled

app/views/contacts/_header.html.haml

@@ -10,11 +10,12 @@
         -else
           %i.entypo.lock.contacts-header-icon{:title => t('aspects.edit.aspect_list_is_not_visible')}
 
-      = link_to aspect_toggle_chat_privilege_path(@aspect), id: "chat_privilege_toggle", class: "contacts_button", method: :put, remote: true do
-        -if @aspect.chat_enabled?
-          %i.entypo.chat.enabled.contacts-header-icon{:title => t('aspects.edit.aspect_chat_is_enabled')}
-        -else
-          %i.entypo.chat.contacts-header-icon{:title => t('aspects.edit.aspect_chat_is_not_enabled')}
+      -if AppConfig.chat.enabled?
+        = link_to aspect_toggle_chat_privilege_path(@aspect), id: "chat_privilege_toggle", class: "contacts_button", method: :put, remote: true do
+          -if @aspect.chat_enabled?
+            %i.entypo.chat.enabled.contacts-header-icon{:title => t('aspects.edit.aspect_chat_is_enabled')}
+          -else
+            %i.entypo.chat.contacts-header-icon{:title => t('aspects.edit.aspect_chat_is_not_enabled')}
 
       = link_to @aspect, method: "delete", data: { confirm: t('aspects.edit.confirm_remove_aspect') }, class: 'delete contacts_button', id: 'delete_aspect' do
         %i.entypo.trash.contacts-header-icon{:title => t('delete')}

spec/controllers/jasmine_fixtures/contacts_spec.rb

@@ -7,6 +7,7 @@ require 'spec_helper'
 describe ContactsController, :type => :controller do
   describe '#index' do
     before do
+      AppConfig.chat.enabled = true
       @aspect = bob.aspects.create(:name => "another aspect")
       bob.share_with alice.person, @aspect
       sign_in :user, bob