@dhyasama/totem-models 6.3.4 → 6.3.6

package/lib/Organization.js

@@ -220,39 +220,39 @@ module.exports = function(mongoose, config) {
             // order for standard fields only sets the order on the list page. their position is fixed on the org page deal section and edit form.
             // order is co-mingled with order for custom fields
             // colspan is for the number of columns the field should take up on the list page
-            // showFilter controls whether values are extracted and used in filtering options on list page
-            // showList controls if the field will be on deal list page
+            // showOnFilter controls whether values are extracted and used in filtering options on list page
+            // showOnList controls if the field will be on deal list page
 
             fundraise: {
               active: { type: Boolean, default: true },
               order: { type: Number, default: 99 },
               colspan: { type: Number, default: 1 },
-              showFilter: { type: Boolean, default: true },
-              showList: { type: Boolean, default: true }
+              showOnFilter: { type: Boolean, default: true },
+              showOnList: { type: Boolean, default: true }
             },
 
             sources: {
               active: { type: Boolean, default: true },
               order: { type: Number, default: 99 },
               colspan: { type: Number, default: 1 },
-              showFilter: { type: Boolean, default: true },
-              showList: { type: Boolean, default: true }
+              showOnFilter: { type: Boolean, default: true },
+              showOnList: { type: Boolean, default: true }
             },
 
             referrers: {
               active: { type: Boolean, default: true },
               order: { type: Number, default: 99 },
               colspan: { type: Number, default: 1 },
-              showFilter: { type: Boolean, default: true },
-              showList: { type: Boolean, default: true }
+              showOnFilter: { type: Boolean, default: true },
+              showOnList: { type: Boolean, default: true }
             },
 
             resources: {
               active: { type: Boolean, default: true },
               order: { type: Number, default: 99 },
               colspan: { type: Number, default: 1 },
-              showFilter: { type: Boolean, default: true },
-              showList: { type: Boolean, default: true }
+              showOnFilter: { type: Boolean, default: true },
+              showOnList: { type: Boolean, default: true }
             },
 
           },
@@ -297,12 +297,12 @@ module.exports = function(mongoose, config) {
               // colspan is for the number of columns the field should take up on the list page
               colspan: { type: Number, default: 1 },
 
-              // showFilter controls whether values are extracted and used in filtering options on list page
-              showFilter: { type: Boolean, default: true },
+              // showOnFilter controls whether values are extracted and used in filtering options on list page
+              showOnFilter: { type: Boolean, default: true },
 
-              // showList controls if the field will be on deal list page
+              // showOnList controls if the field will be on deal list page
               // fields are always shown on org pages and in edit forms
-              showList: { type: Boolean, default: true }
+              showOnList: { type: Boolean, default: true }
 
             }
 
@@ -515,15 +515,15 @@ module.exports = function(mongoose, config) {
     standardFields = standardFields || {
       fundraise: {
         active: false,
-        showList: false
+        showOnList: false
       },
       sources: {
         active: false,
-        showList: false
+        showOnList: false
       },
       referrers: {
         active: false,
-        showList: false
+        showOnList: false
       }
     };
 
@@ -531,36 +531,40 @@ module.exports = function(mongoose, config) {
     var result = [];
 
     // Add the standard fields that are active
-    if (standardFields.fundraise.active && standardFields.fundraise.showList) {
+    if (standardFields.fundraise.active && standardFields.fundraise.showOnList) {
       result.push({
         name: 'Fundraise Amount',
-        order: standardFields.fundraise.order * 10
+        order: standardFields.fundraise.order * 10,
+        colspan: standardFields.fundraise.colspan
       }, {
         name: 'Fundraise Valuation',
         order: standardFields.fundraise.order * 10 + 1
       });
     }
 
-    if (standardFields.sources.active && standardFields.sources.showList) {
+    if (standardFields.sources.active && standardFields.sources.showOnList) {
       result.push({
         name: 'Source',
-        order: standardFields.sources.order * 10
+        order: standardFields.sources.order * 10,
+        colspan: standardFields.fundraise.colspan
       });
     }
 
-    if (standardFields.referrers.active && standardFields.referrers.showList) {
+    if (standardFields.referrers.active && standardFields.referrers.showOnList) {
       result.push({
         name: 'Referrers',
-        order: standardFields.referrers.order * 10
+        order: standardFields.referrers.order * 10,
+        colspan: standardFields.fundraise.colspan
       });
     }
 
     // Add the custom fields
     _.each(customFields, function(field) {
-      if (field.display.showList) {
+      if (field.display.showOnList) {
         result.push({
           name: field.label,
-          order: field.display.order * 10
+          order: field.display.order * 10,
+          colspan: field.display.colspan
         });
       }
     });

package/package.json

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