inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-05-12 17:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACA-1162] Destination picker has incorrect title when opened for multiple selection of items (#207)

Browse Source
This commit is contained in:
suzanadirla 2018-03-01 17:57:55 +02:00 committed by Denys Vuika
parent 8558d1f3ca
commit 18e657d2ba
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/common/services/node-actions.service.spec.ts
View File

@ -324,7 +324,7 @@ describe('NodeActionsService', () => {
expect(testContentNodeSelectorComponentData.data.rowFilter({node: destinationFolder})).toBeDefined();
expect(testContentNodeSelectorComponentData.data.imageResolver({node: destinationFolder})).toBeDefined();
expect(testContentNodeSelectorComponentData.data.title).toBe('NODE_SELECTOR.COPY_ITEMS');
expect(translationService.instant).toHaveBeenCalledWith('NODE_SELECTOR.COPY_ITEMS', {name: ''});
expect(translationService.instant).toHaveBeenCalledWith('NODE_SELECTOR.COPY_ITEMS', {name: '', number: 2});
destinationFolder.entry['allowableOperations'] = ['update'];
expect(testContentNodeSelectorComponentData.data.imageResolver({node: destinationFolder})).toBeDefined();
@ -347,7 +347,7 @@ describe('NodeActionsService', () => {
expect(spyOnBatchOperation).toHaveBeenCalled();
expect(testContentNodeSelectorComponentData).toBeDefined();
expect(testContentNodeSelectorComponentData.data.title).toBe('NODE_SELECTOR.COPY_ITEM');
expect(translationService.instant).toHaveBeenCalledWith('NODE_SELECTOR.COPY_ITEM', {name: 'entry-name'});
expect(translationService.instant).toHaveBeenCalledWith('NODE_SELECTOR.COPY_ITEM', {name: 'entry-name', number: 1});
});
it('should use the ContentNodeSelectorComponentData object without file name in title, if no name exists', () => {
@ -367,7 +367,7 @@ describe('NodeActionsService', () => {
expect(spyOnBatchOperation).toHaveBeenCalled();
expect(testContentNodeSelectorComponentData).toBeDefined();
expect(testContentNodeSelectorComponentData.data.title).toBe('NODE_SELECTOR.COPY_ITEMS');
expect(translationService.instant).toHaveBeenCalledWith('NODE_SELECTOR.COPY_ITEMS', {name: ''});
expect(translationService.instant).toHaveBeenCalledWith('NODE_SELECTOR.COPY_ITEMS', {name: '', number: 1});
});
});

4
src/app/common/services/node-actions.service.ts
View File

@ -229,7 +229,9 @@ export class NodeActionsService {
name = nodes[0].entry.name;
keyPrefix = 'ITEM';
}
return this.translation.instant(`NODE_SELECTOR.${action.toUpperCase()}_${keyPrefix}`, {name});
const number = nodes.length;
return this.translation.instant(`NODE_SELECTOR.${action.toUpperCase()}_${keyPrefix}`, {name, number});
}
private canCopyMoveInsideIt(entry: MinimalNodeEntryEntity): boolean {

4
src/assets/i18n/en.json
View File

@ -188,9 +188,9 @@
},
"NODE_SELECTOR": {
"COPY_ITEM": "Copy '{{ name }}' to ...",
"COPY_ITEMS": "Copy to ...",
"COPY_ITEMS": "Copy {{ number }} items to ...",
"MOVE_ITEM": "Move '{{ name }}' to ...",
"MOVE_ITEMS": "Move to ...",
"MOVE_ITEMS": "Move {{ number }} items to ...",
"SEARCH": "Search"
}
}