@dhyasama/totem-models 6.3.9 → 6.4.1

package/.npmignore

@@ -0,0 +1,14 @@
+lib-cov
+*.seed
+*.log
+*.csv
+*.dat
+*.out
+*.pid
+*.gz
+
+npm-debug.log
+node_modules
+
+.DS_Store
+.idea

package/lib/Organization.js

@@ -499,7 +499,7 @@ module.exports = function(mongoose, config) {
 
   Organization.virtual('customer.deals.fields').get(function () {
 
-    // Combine ever-present fields, standard fields and custom fields into a single list and sort by column order
+    // Combine standard fields and custom fields into a single list and sort by column order
     // Fundraise is actually two fields, so multiply the order by ten to make room for the extra field
 
     var self = this;
@@ -522,18 +522,20 @@ module.exports = function(mongoose, config) {
     var customFields = self.customer.deals.customFields;
     var result = [];
 
-    // Add the standard fields that are active
+    // Add standard fields
     if (standardFields.fundraise.showOnList) {
       result.push({
         name: 'Fundraise Amount',
         type: 'Standard',
         order: standardFields.fundraise.order * 10,
-        colspan: standardFields.fundraise.colspan,
+        colspan: standardFields.fundraise.colspan || 1,
+        showOnFilter: standardFields.fundraise.showOnFilter === true ? true : false
       }, {
         name: 'Fundraise Valuation',
         type: 'Standard',
         order: standardFields.fundraise.order * 10 + 1,
-        colspan: standardFields.fundraise.colspan
+        colspan: standardFields.fundraise.colspan || 1,
+        showOnFilter: standardFields.fundraise.showOnFilter === true ? true : false
       });
     }
 
@@ -542,7 +544,8 @@ module.exports = function(mongoose, config) {
         name: 'Source',
         type: 'Standard',
         order: standardFields.sources.order * 10,
-        colspan: standardFields.fundraise.colspan
+        colspan: standardFields.sources.colspan || 1,
+        showOnFilter: standardFields.sources.showOnFilter === true ? true : false
       });
     }
 
@@ -551,11 +554,12 @@ module.exports = function(mongoose, config) {
         name: 'Referrers',
         type: 'Standard',
         order: standardFields.referrers.order * 10,
-        colspan: standardFields.fundraise.colspan
+        colspan: standardFields.referrers.colspan || 1,
+        showOnFilter: standardFields.referrers.showOnFilter === true ? true : false
       });
     }
 
-    // Add the custom fields
+    // Add custom fields
     _.each(customFields, function(field) {
       if (field.display.showOnList) {
         result.push({
@@ -564,7 +568,9 @@ module.exports = function(mongoose, config) {
           key: field.key,
           options: field.options,
           order: field.display.order * 10,
-          colspan: field.display.colspan
+          colspan: field.display.colspan || 1,
+          showOnFilter: field.display.showOnFilter === true ? true : false,
+          options: field.options
         });
       }
     });