ABE-171

AdFabConnect · Sep 6, 2016 · cb5cc03 · cb5cc03
1 parent 9f68155
commit cb5cc03
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/cli/handlebars/utils/isTrue.js b/src/cli/handlebars/utils/isTrue.js
@@ -14,9 +14,19 @@ export default function isTrue(v1, operator, v2) {
     case '>=':
       return (v1 >= v2);
     case '&&':
-      return (v1 && v2);
+      var eval1 = false;
+      var eval2 = false;
+      if((v1 && !Array.isArray(v1)) || v1.length>0) eval1 = true;
+      if((v2 && !Array.isArray(v2))  || v2.length>0) eval2 = true;
+
+      return (eval1 && eval2);
     case '||':
-      return (v1 || v2);
+      var eval1 = false;
+      var eval2 = false;
+      if((v1 && !Array.isArray(v1)) || v1.length>0) eval1 = true;
+      if((v2 && !Array.isArray(v2))  || v2.length>0) eval2 = true;
+
+      return (eval1 || eval2);
     default:
       return false;
   }