IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 02:40:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: new message route (#7061)

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2019-02-25 14:01:00 +01:00 committed by GitHub
parent 91e771ece6
commit 6930706830
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/javascripts/discourse/routes/new-message.js.es6
View File

@ -3,12 +3,11 @@ import Group from "discourse/models/group";
export default Discourse.Route.extend({
beforeModel(transition) {
const self = this;
const params = transition.queryParams;
const groupName = params.groupname || params.group_name;
if (self.currentUser) {
self.replaceWith("discovery.latest").then(e => {
if (this.currentUser) {
this.replaceWith("discovery.latest").then(e => {
if (params.username) {
// send a message to a user
User.findByUsername(params.username)
@ -28,9 +27,7 @@ export default Discourse.Route.extend({
);
}
})
.catch(function() {
bootbox.alert(I18n.t("generic_error"));
});
.catch(() => bootbox.alert(I18n.t("generic_error")));
} else if (groupName) {
// send a message to a group
Group.messageable(groupName)
@ -50,9 +47,7 @@ export default Discourse.Route.extend({
);
}
})
.catch(function() {
bootbox.alert(I18n.t("generic_error"));
});
.catch(() => bootbox.alert(I18n.t("generic_error")));
}
});
} else {
@ -60,7 +55,7 @@ export default Discourse.Route.extend({
if (Discourse.showingSignup) {
Discourse.showingSignup = false;
} else {
self.replaceWith("login");
this.replaceWith("login");
}
}
}