diff options
author | Phil Hughes <me@iamphill.com> | 2016-10-19 10:44:55 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-10-19 10:44:55 +0300 |
commit | f1350a5c825610f908ed7182855af436fe4957dd (patch) | |
tree | f72b471c2abc99b37ee30f716363d8a29b75fe77 /app/assets/javascripts/users_select.js | |
parent | e4176f4ec42fa8e391b088d62deef051cdafaf23 (diff) | |
parent | f64e36c44832db125beab5923c0177ff69ccedba (diff) |
Merge branch 'master' into issue-board-sidebar
Diffstat (limited to 'app/assets/javascripts/users_select.js')
-rw-r--r-- | app/assets/javascripts/users_select.js | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/app/assets/javascripts/users_select.js b/app/assets/javascripts/users_select.js index 82c75c614b1..6626d730e87 100644 --- a/app/assets/javascripts/users_select.js +++ b/app/assets/javascripts/users_select.js @@ -186,7 +186,7 @@ selectedId = user.id; return; } - if (page === 'projects:boards:show' && !$dropdown.hasClass('js-issue-board-sidebar')) { + if ($('html').hasClass('issue-boards-page') && !$dropdown.hasClass('js-issue-board-sidebar')) { selectedId = user.id; gl.issueBoards.BoardsStore.state.filters[$dropdown.data('field-name')] = user.id; gl.issueBoards.BoardsStore.updateFiltersUrl(); @@ -300,10 +300,11 @@ } } if (showEmailUser && data.results.length === 0 && query.term.match(/^[^@]+@[^@]+$/)) { + var trimmed = query.term.trim(); emailUser = { name: "Invite \"" + query.term + "\"", - username: query.term, - id: query.term + username: trimmed, + id: trimmed }; data.results.unshift(emailUser); } @@ -363,6 +364,10 @@ }; UsersSelect.prototype.user = function(user_id, callback) { + if(!/^\d+$/.test(user_id)) { + return false; + } + var url; url = this.buildUrl(this.userPath); url = url.replace(':id', user_id); |