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

Trim tag names to avoid problems

This commit is contained in:
Joas Schilling 2016-01-28 14:23:56 +01:00 committed by Roeland Jago Douma
parent 6fc3269670
commit c925bfdcd6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,7 +133,7 @@
cid: this.cid, cid: this.cid,
name: oldName, name: oldName,
deleteTooltip: t('core', 'Delete'), deleteTooltip: t('core', 'Delete'),
renameLabel: t('core', 'Rename'), renameLabel: t('core', 'Rename')
})); }));
$item.find('.label').after($renameForm); $item.find('.label').after($renameForm);
$item.find('.label, .systemtags-actions').addClass('hidden'); $item.find('.label, .systemtags-actions').addClass('hidden');
@ -160,7 +160,7 @@
var $item = $form.closest('.systemtags-item'); var $item = $form.closest('.systemtags-item');
var tagId = $item.attr('data-id'); var tagId = $item.attr('data-id');
var tagModel = this.collection.get(tagId); var tagModel = this.collection.get(tagId);
var newName = $(ev.target).find('input').val(); var newName = $(ev.target).find('input').val().trim();
if (newName && newName !== tagModel.get('name')) { if (newName && newName !== tagModel.get('name')) {
tagModel.save({'name': newName}); tagModel.save({'name': newName});
// TODO: spinner, and only change text after finished saving // TODO: spinner, and only change text after finished saving
@ -204,7 +204,7 @@
// newly created tag, check if existing // newly created tag, check if existing
// create a new tag // create a new tag
tag = this.collection.create({ tag = this.collection.create({
name: e.object.name, name: e.object.name.trim(),
userVisible: true, userVisible: true,
userAssignable: true userAssignable: true
}, { }, {
@ -219,7 +219,7 @@
self.collection.fetch({ self.collection.fetch({
success: function(collection) { success: function(collection) {
// find the tag in the collection // find the tag in the collection
var model = collection.where({name: e.object.name, userVisible: true, userAssignable: true}); var model = collection.where({name: e.object.name.trim(), userVisible: true, userAssignable: true});
if (model.length) { if (model.length) {
model = model[0]; model = model[0];
// the tag already exists or was already assigned, // the tag already exists or was already assigned,
@ -260,7 +260,7 @@
var self = this; var self = this;
this.collection.fetch({ this.collection.fetch({
success: function(collection) { success: function(collection) {
var tagModels = collection.filterByName(query.term); var tagModels = collection.filterByName(query.term.trim());
if (!self._isAdmin) { if (!self._isAdmin) {
tagModels = _.filter(tagModels, function(tagModel) { tagModels = _.filter(tagModels, function(tagModel) {
return tagModel.get('userAssignable'); return tagModel.get('userAssignable');
@ -319,6 +319,7 @@
* @return {Object} dummy tag * @return {Object} dummy tag
*/ */
_createSearchChoice: function(term) { _createSearchChoice: function(term) {
term = term.trim();
if (this.collection.filterByName(term).length) { if (this.collection.filterByName(term).length) {
return; return;
} }