mirror of
https://github.com/Alfresco/alfresco-content-app.git
synced 2025-05-12 17:04:46 +00:00
upload permission (#278)
This commit is contained in:
parent
3065f122f2
commit
7209318bf0
@ -109,7 +109,7 @@
|
|||||||
<div class="inner-layout__panel" [ngClass]="{'adf-document-list--loading': isLoading}">
|
<div class="inner-layout__panel" [ngClass]="{'adf-document-list--loading': isLoading}">
|
||||||
<adf-upload-drag-area
|
<adf-upload-drag-area
|
||||||
[parentId]="node?.id"
|
[parentId]="node?.id"
|
||||||
[disabled]="!canCreateContent(node)">
|
[disabled]="!permission.check(node, ['create'])">
|
||||||
|
|
||||||
<adf-document-list #documentList
|
<adf-document-list #documentList
|
||||||
[attr.class]="documentList.isEmpty() ? 'adf-document-list--empty' : ''"
|
[attr.class]="documentList.isEmpty() ? 'adf-document-list--empty' : ''"
|
||||||
|
@ -45,6 +45,7 @@ import { DocumentListService } from '@alfresco/adf-content-services';
|
|||||||
import { ContentManagementService } from '../../common/services/content-management.service';
|
import { ContentManagementService } from '../../common/services/content-management.service';
|
||||||
import { BrowsingFilesService } from '../../common/services/browsing-files.service';
|
import { BrowsingFilesService } from '../../common/services/browsing-files.service';
|
||||||
import { NodeActionsService } from '../../common/services/node-actions.service';
|
import { NodeActionsService } from '../../common/services/node-actions.service';
|
||||||
|
import { NodePermissionService } from '../../common/services/node-permission.service';
|
||||||
import { NodeInfoDirective } from '../../common/directives/node-info.directive';
|
import { NodeInfoDirective } from '../../common/directives/node-info.directive';
|
||||||
|
|
||||||
import { FilesComponent } from './files.component';
|
import { FilesComponent } from './files.component';
|
||||||
@ -102,6 +103,7 @@ describe('FilesComponent', () => {
|
|||||||
DocumentListService,
|
DocumentListService,
|
||||||
ThumbnailService,
|
ThumbnailService,
|
||||||
NodeActionsService,
|
NodeActionsService,
|
||||||
|
NodePermissionService,
|
||||||
UploadService,
|
UploadService,
|
||||||
BrowsingFilesService
|
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()', () => {
|
describe('onNodeDoubleClick()', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
spyOn(component, 'fetchNode').and.returnValue(Observable.of(node));
|
spyOn(component, 'fetchNode').and.returnValue(Observable.of(node));
|
||||||
|
@ -35,6 +35,7 @@ import {
|
|||||||
import { BrowsingFilesService } from '../../common/services/browsing-files.service';
|
import { BrowsingFilesService } from '../../common/services/browsing-files.service';
|
||||||
import { ContentManagementService } from '../../common/services/content-management.service';
|
import { ContentManagementService } from '../../common/services/content-management.service';
|
||||||
import { NodeActionsService } from '../../common/services/node-actions.service';
|
import { NodeActionsService } from '../../common/services/node-actions.service';
|
||||||
|
import { NodePermissionService } from '../../common/services/node-permission.service';
|
||||||
|
|
||||||
import { PageComponent } from '../page.component';
|
import { PageComponent } from '../page.component';
|
||||||
|
|
||||||
@ -61,6 +62,7 @@ export class FilesComponent extends PageComponent implements OnInit, OnDestroy {
|
|||||||
private browsingFilesService: BrowsingFilesService,
|
private browsingFilesService: BrowsingFilesService,
|
||||||
private contentService: ContentService,
|
private contentService: ContentService,
|
||||||
private apiService: AlfrescoApiService,
|
private apiService: AlfrescoApiService,
|
||||||
|
public permission: NodePermissionService,
|
||||||
preferences: UserPreferencesService) {
|
preferences: UserPreferencesService) {
|
||||||
super(preferences);
|
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 = {}) {
|
load(showIndicator: boolean = false, pagination: any = {}) {
|
||||||
this.isLoading = showIndicator;
|
this.isLoading = showIndicator;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user