[ADF-2562] Download a previous version (#3141)

* [ADF-2562] Download a previous version

* [ADF-2562] add input property to enable/disable version downloads

* [ADF-2562] add example in demo-shell

* [ADF-2562] unit tests

* [ADF-2561] View comments on previous versions (#3137)

* [ADF-2561] View comments on previous versions

add input property to enable/disable viewing version comments

* [ADF-2561] add more tests

* remove name property

* test fixes
This commit is contained in:
Suzana Dirla
2018-04-05 23:24:05 +03:00
committed by Denys Vuika
parent 9792f83c9b
commit 7b7e39d989
13 changed files with 95 additions and 19 deletions

View File

@@ -59,6 +59,7 @@
"CUSTOM_FILTER" :"Custom extensions filter",
"MAX_SIZE" : "Max size filter",
"ENABLE_VERSIONING" :"Enable versioning",
"ENABLE_VERSION_DOWNLOAD" :"Enable version download",
"DESCRIPTION_UPLOAD" : "Enable upload",
"ENABLE_INFINITE_SCROLL":"Enable Infinite Scrolling",
"MULTISELECT_DESCRIPTION" : "Use Cmd (Mac) or Ctrl (Windows) to toggle selection of multiple items",

View File

@@ -353,7 +353,8 @@
<ng-container *ngIf="userHasPermissionToManageVersions(); else no_permission_to_versions">
<adf-version-manager
[node]="documentList.selection[0].entry"
[showComments]="showVersionComments">
[showComments]="showVersionComments"
[enableDownload]="enableVersionDownload">
</adf-version-manager>
</ng-container>
</ng-container>
@@ -440,8 +441,11 @@
</section>
<section>
<mat-slide-toggle [color]="'primary'" [(ngModel)]="showVersionComments">{{'DOCUMENT_LIST.SHOW_VERSION_COMMENTS' |
translate}}
<mat-slide-toggle [color]="'primary'" [(ngModel)]="showVersionComments">
{{'DOCUMENT_LIST.SHOW_VERSION_COMMENTS' | translate}}
</mat-slide-toggle>
<mat-slide-toggle [color]="'primary'" [(ngModel)]="enableVersionDownload">
{{'DOCUMENT_LIST.ENABLE_VERSION_DOWNLOAD' | translate}}
</mat-slide-toggle>
</section>

View File

@@ -102,6 +102,9 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
@Input()
versioning = false;
@Input()
enableVersionDownload = true;
@Input()
acceptedFilesType = '.jpg,.pdf,.js';
@@ -362,10 +365,11 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
onManageVersions(event) {
const contentEntry = event.value.entry;
const showComments = this.showVersionComments;
const enableDownload = this.enableVersionDownload;
if (this.contentService.hasPermission(contentEntry, 'update')) {
this.dialog.open(VersionManagerDialogAdapterComponent, {
data: { contentEntry, showComments },
data: { contentEntry, showComments, enableDownload },
panelClass: 'adf-version-manager-dialog',
width: '630px'
});

View File

@@ -1,6 +1,6 @@
<header mat-dialog-title>{{'VERSION.DIALOG.TITLE' | translate}}</header>
<section mat-dialog-content>
<adf-version-manager [node]="contentEntry" [showComments]="showComments" (uploadError)="uploadError($event)"></adf-version-manager>
<adf-version-manager [node]="contentEntry" [enableDownload]="enableDownload" [showComments]="showComments" (uploadError)="uploadError($event)"></adf-version-manager>
</section>
<footer mat-dialog-actions fxLayout="row" fxLayoutAlign="end center">
<button mat-button (click)="close()">{{'VERSION.DIALOG.CLOSE' | translate}}</button>

View File

@@ -28,12 +28,14 @@ export class VersionManagerDialogAdapterComponent {
public contentEntry: MinimalNodeEntryEntity;
showComments = true;
enableDownload = true;
constructor(@Inject(MAT_DIALOG_DATA) data: any,
private snackBar: MatSnackBar,
private containingDialog?: MatDialogRef<VersionManagerDialogAdapterComponent>) {
this.contentEntry = data.contentEntry;
this.showComments = data.hasOwnProperty('showComments') ? data.showComments : this.showComments;
this.enableDownload = data.hasOwnProperty('enableDownload') ? data.enableDownload : this.enableDownload;
}
uploadError(errorMessage: string) {