jschaufuss/DiceCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes #187

Browse Source
This commit is contained in:
Stefan Zermatten
2018-11-13 08:58:42 +02:00
parent e17dbf6601
commit 96f4e35e25
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/client/views/character/characterSettings/shareDialog.js
View File

@@ -53,7 +53,7 @@ Template.shareDialog.events({
Characters.update(this._id, {$set: {"settings.viewPermission": value}}); Characters.update(this._id, {$set: {"settings.viewPermission": value}});
}, },
"input #userNameOrEmailInput": "input #userNameOrEmailInput":
function(event, instance){ _.debounce(function(event, instance){
var userName = instance.find("#userNameOrEmailInput").value; var userName = instance.find("#userNameOrEmailInput").value;
instance.userId.set(undefined); instance.userId.set(undefined);
Meteor.call("getUserId", userName, function(err, result) { Meteor.call("getUserId", userName, function(err, result) {
@@ -64,7 +64,7 @@ Template.shareDialog.events({
instance.userId.set(result); instance.userId.set(result);
} }
}); });
}, }, 300),
"click #shareButton": function(event, instance){ "click #shareButton": function(event, instance){
var self = this; var self = this;
var permission = instance.find("#accessLevelMenu").selected; var permission = instance.find("#accessLevelMenu").selected;

11
app/lib/functions/shareCharacter.js
View File

@@ -1,14 +1,9 @@
Meteor.methods({ Meteor.methods({
"getUserId": function(username){ "getUserId": function(username){
if (!username) return; if (!username) return;
regex = new RegExp("^" + username + "$", "i") if (Meteor.isClient) return;
var user = Meteor.users.findOne( let user = Accounts.findUserByUsername(username) ||
{$or: [ Accounts.findUserByEmail(username);
{username: username},
{"emails.address": regex},
{"services.google.email": regex},
]}
);
return user && user._id; return user && user._id;
} }
}); });