opt(users): admin can create maker for user if him already join other maker group

This commit is contained in:
OldHawk
2017-12-13 16:14:58 +08:00
parent 0523d911cc
commit c493b086ca
3 changed files with 21 additions and 2 deletions

View File

@@ -183,6 +183,25 @@
}
};
/**
* alreadyIsFounder
* @param u
* @returns {boolean}
*/
vm.alreadyIsFounder = function (u) {
var is = false;
if (u.makers.length > 0) {
angular.forEach(u.makers, function (m) {
if (m.user === u._id) {
is = true;
}
});
}
return is;
};
/**
* showMakerGroup
* @param evt

View File

@@ -86,7 +86,7 @@
<span ng-if="vm.user.makers.length==0">-</span>
<div class="pull-right"
ng-if="vm.authentication.user.isOper && vm.user.makers.length==0">
ng-if="vm.authentication.user.isOper && !vm.alreadyIsFounder(vm.user);">
<button class="btn btn-default btn-xs btn-width-100" ng-click="vm.showMakerGroup($event);">
{{'STATUS_FIELD.BTN_CREATE_MAKER' | translate}}
</button>

View File

@@ -604,7 +604,7 @@ exports.userByID = function (req, res, next, id) {
User.findById(id, '-salt -password -providerData')
.populate('invited_by', 'username displayName profileImageURL')
.populate('makers', 'name')
.populate('makers', 'user name')
.exec(function (err, user) {
if (err) {
return next(err);