From fb79c8786ae32d6d2d46738815ed2b5f43a3f870 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Mon, 25 Sep 2017 13:16:07 +0300
Subject: v0.41

---
 models/users.js | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'models')

diff --git a/models/users.js b/models/users.js
index 505ed93e..c2238cde 100644
--- a/models/users.js
+++ b/models/users.js
@@ -108,10 +108,6 @@ Users.attachSchema(new SimpleSchema({
     type: Boolean,
     optional: true,
   },
-  fromAdmin: {
-    type: Boolean,
-    optional: false,
-  },
 }));
 
 // Search a user in the complete server database by its name or username. This
@@ -439,12 +435,6 @@ if (Meteor.isServer) {
       user.isAdmin = true;
       return user;
     }
-
-    if (options.from === 'admin') {
-      user.fromAdmin = true;
-      return user;
-    }
-
     const disableRegistration = Settings.findOne().disableRegistration;
     if (!disableRegistration) {
       return user;
@@ -534,9 +524,6 @@ if (Meteor.isServer) {
 
   Users.after.insert((userId, doc) => {
 
-    if (doc.fromAdmin)
-      return;
-
     //invite user to corresponding boards
     const disableRegistration = Settings.findOne().disableRegistration;
     if (disableRegistration) {
@@ -595,7 +582,6 @@ if (Meteor.isServer) {
       username: req.body.username,
       email: req.body.email,
       password: 'default',
-      from: 'admin',
     });
 
     JsonRoutes.sendResult(res, {
-- 
cgit v1.2.3-1-g7c22