@dhyasama/totem-models 6.3.2 → 6.3.4

package/lib/Organization.js

@@ -216,43 +216,43 @@ module.exports = function(mongoose, config) {
           standardFields: {
 
             // active set to false will keep the field out of system for customer, i.e., off list page, org page deal section and deal edit form
-            // showOnList controls if the field will be on deal list page
             // if a field is active, it will show up on the org page deal section and deal edit form. there is no way to hide it in those places.
             // 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
-            // filter controls whether values are extracted and used in filtering options on list page
-            // colSpan is for table on list page
+            // 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
 
             fundraise: {
               active: { type: Boolean, default: true },
-              showOnList: { type: Boolean, default: true },
-              order: { type: Number, default: 1 },
-              filter: { type: Boolean, default: false },
-              colSpan: { type: Number, default: 1 }
+              order: { type: Number, default: 99 },
+              colspan: { type: Number, default: 1 },
+              showFilter: { type: Boolean, default: true },
+              showList: { type: Boolean, default: true }
             },
 
             sources: {
               active: { type: Boolean, default: true },
-              showOnList: { type: Boolean, default: false },
               order: { type: Number, default: 99 },
-              filter: { type: Boolean, default: false },
-              colSpan: { type: Number, default: 1 }
+              colspan: { type: Number, default: 1 },
+              showFilter: { type: Boolean, default: true },
+              showList: { type: Boolean, default: true }
             },
 
             referrers: {
               active: { type: Boolean, default: true },
-              showOnList: { type: Boolean, default: false },
               order: { type: Number, default: 99 },
-              filter: { type: Boolean, default: false },
-              colSpan: { type: Number, default: 1 }
+              colspan: { type: Number, default: 1 },
+              showFilter: { type: Boolean, default: true },
+              showList: { type: Boolean, default: true }
             },
 
             resources: {
               active: { type: Boolean, default: true },
-              showOnList: { type: Boolean, default: false },
               order: { type: Number, default: 99 },
-              filter: { type: Boolean, default: false },
-              colSpan: { type: Number, default: 1 }
+              colspan: { type: Number, default: 1 },
+              showFilter: { type: Boolean, default: true },
+              showList: { type: Boolean, default: true }
             },
 
           },
@@ -290,18 +290,19 @@ module.exports = function(mongoose, config) {
             // For controlling display on web pages
             display: {
 
-              // Sets the order to render fields on list, org page deal section and deal edit form
+              // sets the order to render fields on list, org page deal section and deal edit form
+              // order is co-mingled with order for standard fields
               order: { type: Number },
 
-              // Optionally include as an option on the deal
-              filter: { type: Boolean, default: false },
-
-              // Sets the number of columns for this property to span on the deals list
+              // colspan is for the number of columns the field should take up on the list page
               colspan: { type: Number, default: 1 },
 
-              // Optionally show or hide fields on deals list
-              // Fields are always shown on org pages and in edit forms
-              showOnList: { type: Boolean }
+              // showFilter controls whether values are extracted and used in filtering options on list page
+              showFilter: { type: Boolean, default: true },
+
+              // showList 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 }
 
             }
 
@@ -514,15 +515,15 @@ module.exports = function(mongoose, config) {
     standardFields = standardFields || {
       fundraise: {
         active: false,
-        showOnList: false
+        showList: false
       },
       sources: {
         active: false,
-        showOnList: false
+        showList: false
       },
       referrers: {
         active: false,
-        showOnList: false
+        showList: false
       }
     };
 
@@ -530,7 +531,7 @@ module.exports = function(mongoose, config) {
     var result = [];
 
     // Add the standard fields that are active
-    if (standardFields.fundraise.active && standardFields.fundraise.showOnList) {
+    if (standardFields.fundraise.active && standardFields.fundraise.showList) {
       result.push({
         name: 'Fundraise Amount',
         order: standardFields.fundraise.order * 10
@@ -540,14 +541,14 @@ module.exports = function(mongoose, config) {
       });
     }
 
-    if (standardFields.sources.active && standardFields.sources.showOnList) {
+    if (standardFields.sources.active && standardFields.sources.showList) {
       result.push({
         name: 'Source',
         order: standardFields.sources.order * 10
       });
     }
 
-    if (standardFields.referrers.active && standardFields.referrers.showOnList) {
+    if (standardFields.referrers.active && standardFields.referrers.showList) {
       result.push({
         name: 'Referrers',
         order: standardFields.referrers.order * 10
@@ -556,7 +557,7 @@ module.exports = function(mongoose, config) {
 
     // Add the custom fields
     _.each(customFields, function(field) {
-      if (field.display.showOnList) {
+      if (field.display.showList) {
         result.push({
           name: field.label,
           order: field.display.order * 10

package/package.json

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