From 872183b35aba223bdcd5f9fa54d283476fc1b5b3 Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Tue, 21 Mar 2017 13:05:10 +0000 Subject: [PATCH] space sharing view disabled for Keycloak auth provider --- app/app/components/folder/folder-settings.js | 3 ++- app/app/components/folder/folder-toolbar.js | 3 ++- app/app/pods/folder/template.hbs | 4 ++-- app/app/pods/settings/controller.js | 3 ++- app/app/pods/settings/template.hbs | 4 +++- .../components/folder/folder-toolbar.hbs | 18 +++++++++++++----- 6 files changed, 24 insertions(+), 11 deletions(-) diff --git a/app/app/components/folder/folder-settings.js b/app/app/components/folder/folder-settings.js index b0894bcf..cf7e5868 100644 --- a/app/app/components/folder/folder-settings.js +++ b/app/app/components/folder/folder-settings.js @@ -10,12 +10,13 @@ // https://documize.com import Ember from 'ember'; +import AuthMixin from '../../mixins/auth'; const { inject: { service } } = Ember; -export default Ember.Component.extend({ +export default Ember.Component.extend(AuthMixin, { folderService: service('folder'), appMeta: service(), users: [], diff --git a/app/app/components/folder/folder-toolbar.js b/app/app/components/folder/folder-toolbar.js index f5acc50e..37d805cb 100644 --- a/app/app/components/folder/folder-toolbar.js +++ b/app/app/components/folder/folder-toolbar.js @@ -12,12 +12,13 @@ import Ember from 'ember'; import NotifierMixin from '../../mixins/notifier'; import TooltipMixin from '../../mixins/tooltip'; +import AuthMixin from '../../mixins/auth'; const { computed } = Ember; -export default Ember.Component.extend(NotifierMixin, TooltipMixin, { +export default Ember.Component.extend(NotifierMixin, TooltipMixin, AuthMixin, { folderService: Ember.inject.service('folder'), session: Ember.inject.service(), appMeta: Ember.inject.service(), diff --git a/app/app/pods/folder/template.hbs b/app/app/pods/folder/template.hbs index 30922f40..c66f742f 100644 --- a/app/app/pods/folder/template.hbs +++ b/app/app/pods/folder/template.hbs @@ -7,6 +7,6 @@ {{#layout/zone-content}} {{folder/folder-toolbar folders=model.folders folder=model.folder hasSelectedDocuments=hasSelectedDocuments onDeleteDocument=(action - 'onDeleteDocument') onMoveDocument=(action 'onMoveDocument')}} {{folder/documents-list documents=model.documents folder=model.folder - isFolderOwner=isFolderOwner onDocumentsChecked=(action 'onDocumentsChecked') }} + 'onDeleteDocument') onMoveDocument=(action 'onMoveDocument')}} + {{folder/documents-list documents=model.documents folder=model.folder isFolderOwner=isFolderOwner onDocumentsChecked=(action 'onDocumentsChecked') }} {{/layout/zone-content}} diff --git a/app/app/pods/settings/controller.js b/app/app/pods/settings/controller.js index 0d549d9c..2a5d1a5a 100644 --- a/app/app/pods/settings/controller.js +++ b/app/app/pods/settings/controller.js @@ -10,8 +10,9 @@ // https://documize.com import Ember from 'ember'; +import AuthMixin from '../../mixins/auth'; -export default Ember.Controller.extend({ +export default Ember.Controller.extend(AuthMixin, { tabGeneral: false, tabShare: false, tabPermissions: false, diff --git a/app/app/pods/settings/template.hbs b/app/app/pods/settings/template.hbs index 83a34d8a..64c329af 100644 --- a/app/app/pods/settings/template.hbs +++ b/app/app/pods/settings/template.hbs @@ -7,7 +7,9 @@