sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tags in FileInfo map must be an array 

Fixes FileList.elementToFile to make an array for the tags instead of
keeping the original joined string
remotes/origin/db-empty-migrate
Vincent Petry 2015-09-02 19:02:06 +07:00
parent 8684420d0a
commit 73c61941e2
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/files/js/tagsplugin.js
Unescape Escape View File

@ -150,7 +150,13 @@
var oldElementToFile = fileList.elementToFile;
fileList.elementToFile = function($el) {
var fileInfo = oldElementToFile.apply(this, arguments);
fileInfo.tags = $el.attr('data-tags') || [];
var tags = $el.attr('data-tags');
if (_.isUndefined(tags)) {
tags = '';
}
tags = tags.split('|');
tags = _.without(tags, '');
fileInfo.tags = tags;
return fileInfo;
};
},

15
apps/files/tests/js/tagspluginspec.js
Unescape Escape View File

@ -112,4 +112,19 @@ describe('OCA.Files.TagsPlugin tests', function() {
expect($action.find('img').attr('src')).toEqual(OC.imagePath('core', 'actions/star'));
});
});
describe('elementToFile', function() {
it('returns tags', function() {
fileList.setFiles(testFiles);
var $tr = fileList.findFileEl('One.txt');
var data = fileList.elementToFile($tr);
expect(data.tags).toEqual(['tag1', 'tag2']);
});
it('returns empty array when no tags present', function() {
delete testFiles[0].tags;
fileList.setFiles(testFiles);
var $tr = fileList.findFileEl('One.txt');
var data = fileList.elementToFile($tr);
expect(data.tags).toEqual([]);
});
});
});