IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Allow non-english usernames in autocomplete

Browse Source 
Also add support for username formatters
This commit is contained in:
Robin Ward 2018-08-01 11:52:59 -04:00
parent 0f6dcb8c40
commit 7c950321d1
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse/components/user-selector.js.es6
View File

@ -2,6 +2,7 @@ import { observes } from "ember-addons/ember-computed-decorators";
import TextField from "discourse/components/text-field"; import TextField from "discourse/components/text-field";
import userSearch from "discourse/lib/user-search"; import userSearch from "discourse/lib/user-search";
import { findRawTemplate } from "discourse/lib/raw-templates"; import { findRawTemplate } from "discourse/lib/raw-templates";
import { formatUsername } from "discourse/lib/utilities";
export default TextField.extend({ export default TextField.extend({
autocorrect: false, autocorrect: false,
@ -46,11 +47,6 @@ export default TextField.extend({
return usernames; return usernames;
} }
const termRegexp =
currentUser && currentUser.can_send_private_email_messages
? /[^\w.-@]/g
: /[^\w.-]/g;
this.$() this.$()
.val(this.get("usernames")) .val(this.get("usernames"))
.autocomplete({ .autocomplete({
@ -62,7 +58,7 @@ export default TextField.extend({
dataSource(term) { dataSource(term) {
var results = userSearch({ var results = userSearch({
term: term.replace(termRegexp, ""), term,
topicId: self.get("topicId"), topicId: self.get("topicId"),
exclude: excludedUsernames(), exclude: excludedUsernames(),
includeGroups, includeGroups,
@ -72,7 +68,6 @@ export default TextField.extend({
group: self.get("group"), group: self.get("group"),
disallowEmails disallowEmails
}); });
return results; return results;
}, },

3
app/assets/javascripts/discourse/lib/user-search.js.es6
View File

@ -122,8 +122,7 @@ export default function userSearch(options) {
currentTerm = term; currentTerm = term;
return new Ember.RSVP.Promise(function(resolve) { return new Ember.RSVP.Promise(function(resolve) {
// TODO site setting for allowed regex in username if (term.length === 0) {
if (term.match(/[^\w_\-\.@\+]/)) {
resolve([]); resolve([]);
return; return;
} }

4
app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs
View File

@ -4,7 +4,7 @@
<li> <li>
<a href title="{{user.name}}"> <a href title="{{user.name}}">
{{avatar user imageSize="tiny"}} {{avatar user imageSize="tiny"}}
<span class='username'>{{user.username}}</span> <span class='username'>{{format-username user.username}}</span>
<span class='name'>{{user.name}}</span> <span class='name'>{{user.name}}</span>
</a> </a>
</li> </li>
@ -15,7 +15,7 @@
<li> <li>
<a href title="{{email.username}}"> <a href title="{{email.username}}">
<i class='fa fa-envelope'></i> <i class='fa fa-envelope'></i>
<span class='username'>{{email.username}}</span> <span class='username'>{{format-username email.username}}</span>
</a> </a>
</li> </li>
{{/each}} {{/each}}