Merge branch 'feature-custom-fields' of https://github.com/feuerball11/wekan into feuerball11-feature-custom-fields

client/components/boards/boardBody.js

@@ -88,11 +88,13 @@ BlazeComponent.extendComponent({
 
   isViewSwimlanes() {
     const currentUser = Meteor.user();
+    if (!currentUser) return false;
     return (currentUser.profile.boardView === 'board-view-swimlanes');
   },
 
   isViewLists() {
     const currentUser = Meteor.user();
+    if (!currentUser) return true;
     return (currentUser.profile.boardView === 'board-view-lists');
   },
 

client/components/cards/minicard.jade

@@ -37,7 +37,8 @@ template(name="minicard")
             .minicard-custom-field-item
               = definition.name
             .minicard-custom-field-item
-              = value
+              +viewer
+                = trueValue
 
     if members
       .minicard-members.js-minicard-members

client/components/sidebar/sidebarCustomFields.jade

@@ -37,7 +37,7 @@ template(name="createCustomFieldPopup")
             each dropdownItems.get
                 input.js-dropdown-item(type="text" value=name placeholder="")
             input.js-dropdown-item.last(type="text" value="" placeholder="{{_ 'custom-field-dropdown-options-placeholder'}}")
-        a.flex.js-field-show-on-card
+        a.flex.js-field-show-on-card(class="{{#if showOnCard}}is-checked{{/if}}")
             .materialCheckBox(class="{{#if showOnCard}}is-checked{{/if}}")
 
             span {{_ 'show-field-on-card'}}
@@ -49,4 +49,4 @@ template(name="createCustomFieldPopup")
 
 template(name="deleteCustomFieldPopup")
     p {{_ "custom-field-delete-pop"}}
-    button.js-confirm.negate.full(type="submit") {{_ 'delete'}}
+    button.js-confirm.negate.full(type="submit") {{_ 'delete'}}

client/lib/filter.js

@@ -145,6 +145,22 @@ class AdvancedFilter {
     return found._id;
   }
 
+  _fieldValueToId(field, value)
+  {
+    const found = CustomFields.findOne({ 'name': field });
+    if (found.settings.dropdownItems && found.settings.dropdownItems.length > 0)
+      {
+      for (let i = 0; i < found.settings.dropdownItems.length; i++)
+        {
+        if (found.settings.dropdownItems[i].name === value)
+          {
+          return found.settings.dropdownItems[i]._id;
+        }
+      }
+    }
+    return value;
+  }
+
   _arrayToSelector(commands) {
     try {
       //let changed = false;
@@ -163,27 +179,27 @@ class AdvancedFilter {
       if (commands[i].cmd) {
         switch (commands[i].cmd) {
         case '(':
-        {
-          level++;
-          if (start === -1) start = i;
-          continue;
-        }
+          {
+            level++;
+            if (start === -1) start = i;
+            continue;
+          }
         case ')':
-        {
-          level--;
-          commands.splice(i, 1);
-          i--;
-          continue;
-        }
-        default:
-        {
-          if (level > 0) {
-            subcommands.push(commands[i]);
+          {
+            level--;
             commands.splice(i, 1);
             i--;
             continue;
           }
-        }
+        default:
+          {
+            if (level > 0) {
+              subcommands.push(commands[i]);
+              commands.splice(i, 1);
+              i--;
+              continue;
+            }
+          }
         }
       }
     }
@@ -205,86 +221,86 @@ class AdvancedFilter {
         case '=':
         case '==':
         case '===':
-        {
-          const field = commands[i - 1].cmd;
-          const str = commands[i + 1].cmd;
-          commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': str };
-          commands.splice(i - 1, 1);
-          commands.splice(i, 1);
+          {
+            const field = commands[i - 1].cmd;
+            const str = commands[i + 1].cmd;
+            commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': {$in: [this._fieldValueToId(field, str), parseInt(str, 10)]} };
+            commands.splice(i - 1, 1);
+            commands.splice(i, 1);
           //changed = true;
-          i--;
-          break;
-        }
+            i--;
+            break;
+          }
         case '!=':
         case '!==':
-        {
-          const field = commands[i - 1].cmd;
-          const str = commands[i + 1].cmd;
-          commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': { $not: str } };
-          commands.splice(i - 1, 1);
-          commands.splice(i, 1);
+          {
+            const field = commands[i - 1].cmd;
+            const str = commands[i + 1].cmd;
+            commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': { $not: {$in: [this._fieldValueToId(field, str), parseInt(str, 10)]} } };
+            commands.splice(i - 1, 1);
+            commands.splice(i, 1);
           //changed = true;
-          i--;
-          break;
-        }
+            i--;
+            break;
+          }
         case '>':
         case 'gt':
         case 'Gt':
         case 'GT':
-        {
-          const field = commands[i - 1].cmd;
-          const str = commands[i + 1].cmd;
-          commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': { $gt: str } };
-          commands.splice(i - 1, 1);
-          commands.splice(i, 1);
+          {
+            const field = commands[i - 1].cmd;
+            const str = commands[i + 1].cmd;
+            commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': { $gt: parseInt(str, 10) } };
+            commands.splice(i - 1, 1);
+            commands.splice(i, 1);
           //changed = true;
-          i--;
-          break;
-        }
+            i--;
+            break;
+          }
         case '>=':
         case '>==':
         case 'gte':
         case 'Gte':
         case 'GTE':
-        {
-          const field = commands[i - 1].cmd;
-          const str = commands[i + 1].cmd;
-          commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': { $gte: str } };
-          commands.splice(i - 1, 1);
-          commands.splice(i, 1);
+          {
+            const field = commands[i - 1].cmd;
+            const str = commands[i + 1].cmd;
+            commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': { $gte:  parseInt(str, 10) } };
+            commands.splice(i - 1, 1);
+            commands.splice(i, 1);
           //changed = true;
-          i--;
-          break;
-        }
+            i--;
+            break;
+          }
         case '<':
         case 'lt':
         case 'Lt':
         case 'LT':
-        {
-          const field = commands[i - 1].cmd;
-          const str = commands[i + 1].cmd;
-          commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': { $lt: str } };
-          commands.splice(i - 1, 1);
-          commands.splice(i, 1);
+          {
+            const field = commands[i - 1].cmd;
+            const str = commands[i + 1].cmd;
+            commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': { $lt:  parseInt(str, 10) } };
+            commands.splice(i - 1, 1);
+            commands.splice(i, 1);
           //changed = true;
-          i--;
-          break;
-        }
+            i--;
+            break;
+          }
         case '<=':
         case '<==':
         case 'lte':
         case 'Lte':
         case 'LTE':
-        {
-          const field = commands[i - 1].cmd;
-          const str = commands[i + 1].cmd;
-          commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': { $lte: str } };
-          commands.splice(i - 1, 1);
-          commands.splice(i, 1);
+          {
+            const field = commands[i - 1].cmd;
+            const str = commands[i + 1].cmd;
+            commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': { $lte:  parseInt(str, 10) } };
+            commands.splice(i - 1, 1);
+            commands.splice(i, 1);
           //changed = true;
-          i--;
-          break;
-        }
+            i--;
+            break;
+          }
 
         }
       }
@@ -300,44 +316,44 @@ class AdvancedFilter {
         case 'OR':
         case '|':
         case '||':
-        {
-          const op1 = commands[i - 1];
-          const op2 = commands[i + 1];
-          commands[i] = { $or: [op1, op2] };
-          commands.splice(i - 1, 1);
-          commands.splice(i, 1);
+          {
+            const op1 = commands[i - 1];
+            const op2 = commands[i + 1];
+            commands[i] = { $or: [op1, op2] };
+            commands.splice(i - 1, 1);
+            commands.splice(i, 1);
           //changed = true;
-          i--;
-          break;
-        }
+            i--;
+            break;
+          }
         case 'and':
         case 'And':
         case 'AND':
         case '&':
         case '&&':
-        {
-          const op1 = commands[i - 1];
-          const op2 = commands[i + 1];
-          commands[i] = { $and: [op1, op2] };
-          commands.splice(i - 1, 1);
-          commands.splice(i, 1);
+          {
+            const op1 = commands[i - 1];
+            const op2 = commands[i + 1];
+            commands[i] = { $and: [op1, op2] };
+            commands.splice(i - 1, 1);
+            commands.splice(i, 1);
           //changed = true;
-          i--;
-          break;
-        }
+            i--;
+            break;
+          }
 
         case 'not':
         case 'Not':
         case 'NOT':
         case '!':
-        {
-          const op1 = commands[i + 1];
-          commands[i] = { $not: op1 };
-          commands.splice(i + 1, 1);
+          {
+            const op1 = commands[i + 1];
+            commands[i] = { $not: op1 };
+            commands.splice(i + 1, 1);
           //changed = true;
-          i--;
-          break;
-        }
+            i--;
+            break;
+          }
 
         }
       }

models/cards.js

@@ -230,12 +230,26 @@ Cards.helpers({
     // match right definition to each field
     if (!this.customFields) return [];
     return this.customFields.map((customField) => {
+      const definition = definitions.find((definition) => {
+        return definition._id === customField._id;
+      });
+      //search for "True Value" which is for DropDowns other then the Value (which is the id)
+      let trueValue = customField.value;
+      if (definition.settings.dropdownItems && definition.settings.dropdownItems.length > 0)
+      {
+        for (let i = 0; i < definition.settings.dropdownItems.length; i++)
+        {
+          if (definition.settings.dropdownItems[i]._id === customField.value)
+          {
+            trueValue = definition.settings.dropdownItems[i].name;
+          }
+        }
+      }
       return {
         _id: customField._id,
         value: customField.value,
-        definition: definitions.find((definition) => {
-          return definition._id === customField._id;
-        }),
+        trueValue,
+        definition,
       };
     });