@dhyasama/totem-models 6.16.0 → 6.16.2

package/lib/Organization.js

@@ -822,13 +822,13 @@ module.exports = function(mongoose, config) {
     var self = this;
 
     if (self.ipo.ticker) return 'IPO';
-    else if (self.acquired.by) return 'Acquired';
+    else if (self.acquired.by || self.acquired.on) return 'Acquired';
     else if (self.shutdown) return 'Shutdown';
     else if (self.inactive) return 'Inactive';
     else return 'Active';
 
   });
-
+  
   Organization.virtual('websites').get(function () {
 
     var self = this;
@@ -1818,20 +1818,18 @@ module.exports = function(mongoose, config) {
     this.collection.stats(cb);
   };
 
-  LimitedPartner.statics.upsert = function(lp, username, role, cb) {
+  Organization.statics.upsert = function(org, username, cb) {
 
-    if (!lp) { return cb(new Error('lp is required'), null); }
-    if (!username) { return cb(new Error('username is required'), null); }
+    if (!org) { return cb(new Error('Organization is required'), null); }
+    if (!username) { return cb(new Error('Username is required'), null); }
 
-    lp.entered.by = username;
-    lp.entered.on = new Date();
+    org.entered.by = username;
+    org.entered.on = new Date();
 
-    lp.extendWithWriteFilter(lp, role);
-    lp.save(function(err, result) {
-      if (err) return cb(err, null);
-      result.applyReadFilter(role);
-      return cb(null, result);
-    });
+    // Clean up missing references
+    org.people = _.reject(org.people, function(item) { return !item.person; });
+
+    org.save(cb);
 
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-models",
-  "version": "6.16.0",
+  "version": "6.16.2",
   "author": "Jason Reynolds",
   "license": "UNLICENSED",
   "description": "Models for Totem platform",