diff --git a/src/app/components/files/files.component.html b/src/app/components/files/files.component.html index c2c9313a1..2ebce5408 100644 --- a/src/app/components/files/files.component.html +++ b/src/app/components/files/files.component.html @@ -109,7 +109,7 @@
+ [disabled]="!permission.check(node, ['create'])"> { DocumentListService, ThumbnailService, NodeActionsService, + NodePermissionService, UploadService, BrowsingFilesService ], @@ -326,31 +328,6 @@ describe('FilesComponent', () => { }); }); - describe('Create permission', () => { - beforeEach(() => { - spyOn(component, 'fetchNode').and.returnValue(Observable.of(node)); - spyOn(component, 'fetchNodes').and.returnValue(Observable.of(page)); - - fixture.detectChanges(); - }); - - it('returns false when node is not provided', () => { - expect(component.canCreateContent(null)).toBe(false); - }); - - it('returns false when node does not have permission', () => { - spyOn(alfrescoContentService, 'hasPermission').and.returnValue(false); - - expect(component.canCreateContent(node)).toBe(false); - }); - - it('returns false when node has permission', () => { - spyOn(alfrescoContentService, 'hasPermission').and.returnValue(true); - - expect(component.canCreateContent(node)).toBe(true); - }); - }); - describe('onNodeDoubleClick()', () => { beforeEach(() => { spyOn(component, 'fetchNode').and.returnValue(Observable.of(node)); diff --git a/src/app/components/files/files.component.ts b/src/app/components/files/files.component.ts index d995daab3..5869ed5a7 100644 --- a/src/app/components/files/files.component.ts +++ b/src/app/components/files/files.component.ts @@ -35,6 +35,7 @@ import { import { BrowsingFilesService } from '../../common/services/browsing-files.service'; import { ContentManagementService } from '../../common/services/content-management.service'; import { NodeActionsService } from '../../common/services/node-actions.service'; +import { NodePermissionService } from '../../common/services/node-permission.service'; import { PageComponent } from '../page.component'; @@ -61,6 +62,7 @@ export class FilesComponent extends PageComponent implements OnInit, OnDestroy { private browsingFilesService: BrowsingFilesService, private contentService: ContentService, private apiService: AlfrescoApiService, + public permission: NodePermissionService, preferences: UserPreferencesService) { super(preferences); @@ -202,14 +204,6 @@ export class FilesComponent extends PageComponent implements OnInit, OnDestroy { } } - canCreateContent(parentNode: MinimalNodeEntryEntity): boolean { - if (parentNode) { - return this.contentService.hasPermission(parentNode, 'create'); - } - - return false; - } - load(showIndicator: boolean = false, pagination: any = {}) { this.isLoading = showIndicator;