mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23387 from owncloud/stable9-systemtags-create-same-prefix 

[stable9] Allow creating tags where another one with same prefix exists
This commit is contained in:
Thomas Müller 2016-03-21 09:42:18 +01:00
parent 382b18e85e a7dfc70e2e
commit 179ac2b98c
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/js/systemtags/systemtagsinputfield.js
View File

@ -320,7 +320,9 @@
*/
_createSearchChoice: function(term) {
term = term.trim();
if (this.collection.filterByName(term).length) {
if (this.collection.filter(function(entry) {
return entry.get('name') === term;
}).length) {
return;
}
if (!this._newTag) {

9
core/js/tests/specs/systemtags/systemtagsinputfieldSpec.js
View File

@ -85,6 +85,15 @@ describe('OC.SystemTags.SystemTagsInputField tests', function() {
expect(result.userVisible).toEqual(true);
expect(result.userAssignable).toEqual(true);
});
it('creates dummy tag when user types non-matching name even with prefix of existing tag', function() {
var opts = select2Stub.getCall(0).args[0];
var result = opts.createSearchChoice('ab');
expect(result.id).toEqual(-1);
expect(result.name).toEqual('ab');
expect(result.isNew).toEqual(true);
expect(result.userVisible).toEqual(true);
expect(result.userAssignable).toEqual(true);
});
it('creates the real tag and fires select event after user selects the dummy tag', function() {
var selectHandler = sinon.stub();
view.on('select', selectHandler);