Repository: couchdb Updated Branches: refs/heads/Query-Options-UI 3a009855f -> b0f03e712
Seperate error messages for keys Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/b0f03e71 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/b0f03e71 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/b0f03e71 Branch: refs/heads/Query-Options-UI Commit: b0f03e712a522468f6388865f763768769e9e16f Parents: 3a00985 Author: Garren Smith <[email protected]> Authored: Thu Mar 20 18:35:43 2014 +0200 Committer: Garren Smith <[email protected]> Committed: Thu Mar 20 18:35:43 2014 +0200 ---------------------------------------------------------------------- src/fauxton/app/addons/documents/views.js | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/b0f03e71/src/fauxton/app/addons/documents/views.js ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/views.js b/src/fauxton/app/addons/documents/views.js index bba23af..cc23e19 100644 --- a/src/fauxton/app/addons/documents/views.js +++ b/src/fauxton/app/addons/documents/views.js @@ -1142,17 +1142,26 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, resizeColum }, validateKeys: function(param){ - var parsedValue = this.parseJSON(param.value); - if (_.isUndefined(parsedValue) || !_.isArray(parsedValue)) { + var errorMsg = false, + parsedValue = this.parseJSON(param.value); + + if (_.isUndefined(parsedValue)) { + errorMsg = "Keys must be valid json."; + } else if (!_.isArray(parsedValue)) { + errorMsg = "Keys values must be in an array. E.g [1,2,3]"; + } + + if (errorMsg) { this.$('.js-keys-error').empty(); FauxtonAPI.addNotification({ type: "error", - msg: "Keys values must be in an array. E.g [1,2,3]", + msg: errorMsg, clear: false, selector: '.js-keys-error' }); return false; } + return true; }, queryParams: function () {
