inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-2563] Improve versioning functionality (#3335)

Browse Source 
* change input with textarea

* update file version use now the update content API

* provide way to test read only mode version list

* fix test

* test fix
This commit is contained in:
Eugenio Romano
2018-05-17 11:35:42 +01:00
committed by GitHub
parent 9772b2308a
commit 9e3a4aa49f
12 changed files with 58 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/content-services/upload/components/base-upload/upload-base.spec.ts
View File

@@ -59,8 +59,6 @@ describe('UploadBase', () => {
fixture = TestBed.createComponent(UploadTestComponent);
uploadService = TestBed.get(UploadService);
spyOn(FileModel.prototype, 'generateId').and.returnValue('test');
component = fixture.componentInstance;
fixture.detectChanges();
});

4
lib/content-services/upload/components/base-upload/upload-base.ts
View File

@@ -137,7 +137,7 @@ export abstract class UploadBase {
*
* @param file
*/
protected createFileModel(file: File, parentId: string, path: string): FileModel {
protected createFileModel(file: File, parentId: string, path: string, id?: string): FileModel {
return new FileModel(file, {
comment: this.comment,
majorVersion: this.majorVersion,
@@ -145,7 +145,7 @@ export abstract class UploadBase {
parentId: parentId,
path: path,
nodeType: this.nodeType
});
}, id);
}
protected isFileSizeAllowed(file: FileModel) {

16
lib/content-services/upload/components/upload-version-button.component.ts
View File

@@ -16,7 +16,7 @@
*/
import { PermissionsEnum } from '@alfresco/adf-core';
import { Component, forwardRef, Input, OnChanges, SimpleChanges, ViewEncapsulation, OnInit } from '@angular/core';
import { Component, forwardRef, Input, OnChanges, ViewEncapsulation, OnInit } from '@angular/core';
import { MinimalNodeEntryEntity } from 'alfresco-js-api';
import { UploadButtonComponent } from './upload-button.component';
import { FileModel, EXTENDIBLE_COMPONENT } from '@alfresco/adf-core';
@@ -36,20 +36,8 @@ export class UploadVersionButtonComponent extends UploadButtonComponent implemen
@Input()
node: MinimalNodeEntryEntity;
ngOnChanges(changes: SimpleChanges) {
super.ngOnChanges(changes);
if (changes['acceptedFilesType']) {
const message = this.translationService.instant('FILE_UPLOAD.VERSION.MESSAGES.NO_ACCEPTED_FILE_TYPES');
this.logService.error(message);
}
this.acceptedFilesType = '.' + this.node.name.split('.').pop();
}
protected createFileModel(file: File): FileModel {
const fileModel = super.createFileModel(file, this.rootFolderId, (file.webkitRelativePath || '').replace(/\/[^\/]*$/, ''));
fileModel.options.newVersionBaseName = this.node.name;
const fileModel = super.createFileModel(file, this.rootFolderId, (file.webkitRelativePath || '').replace(/\/[^\/]*$/, ''), this.node.id);
if (!this.isFileAcceptable(fileModel)) {
const message = this.translationService.instant('FILE_UPLOAD.VERSION.MESSAGES.INCOMPATIBLE_VERSION');