summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-11-14 14:02:07 +0100
committerGitHub <noreply@github.com>2016-11-14 14:02:07 +0100
commitcebb68992509215163f6776b76e48411a31a287e (patch)
tree3fa3e7ac195eb8344c25c30f31b2040867f7500c
parentfdd904414f27e915482e2d83c965ef75b7b93f2d (diff)
parentb35812fce6463ff2d3e979d0124b2bbae801bb25 (diff)
downloadnextcloud-server-cebb68992509215163f6776b76e48411a31a287e.tar.gz
nextcloud-server-cebb68992509215163f6776b76e48411a31a287e.zip
Merge pull request #2106 from nextcloud/proper-empty-message-for-tags
Show specific empty message for tag input fields
-rw-r--r--apps/systemtags/js/systemtagsfilelist.js3
-rw-r--r--core/js/systemtags/systemtagsinputfield.js3
2 files changed, 6 insertions, 0 deletions
diff --git a/apps/systemtags/js/systemtagsfilelist.js b/apps/systemtags/js/systemtagsfilelist.js
index 56838018a2c..25f377785b7 100644
--- a/apps/systemtags/js/systemtagsfilelist.js
+++ b/apps/systemtags/js/systemtagsfilelist.js
@@ -115,6 +115,9 @@
escapeMarkup: function(m) {
// prevent double markup escape
return m;
+ },
+ formatNoMatches: function() {
+ return t('systemtags', 'No tags found');
}
});
this.$filterField.on('change', _.bind(this._onTagsChanged, this));
diff --git a/core/js/systemtags/systemtagsinputfield.js b/core/js/systemtags/systemtagsinputfield.js
index 2eb8d0a44cb..5d986d17290 100644
--- a/core/js/systemtags/systemtagsinputfield.js
+++ b/core/js/systemtags/systemtagsinputfield.js
@@ -408,6 +408,9 @@
return 1;
});
return results;
+ },
+ formatNoMatches: function() {
+ return t('core', 'No tags found');
}
})
.on('select2-selecting', this._onSelectTag)