merge

abecms · Oct 3, 2016 · f719973 · f719973
1 parent 3e085fd
commit f719973
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 92 deletions.
diff --git a/src/cli/cms/data/abe-sql.js b/src/cli/cms/data/abe-sql.js
@@ -367,69 +367,6 @@ export default class Sql {
     return res
   }
 
-<<<<<<< HEAD
-=======
-  static whereEquals(where, value, compare) {
-    var shouldAdd = true
-    if(where === 'template' || where === 'abe_meta.template') {
-      if(value && value.indexOf('/') > -1 && value !== compare) {
-        shouldAdd = false
-      }else if(value && value.indexOf('/') === -1 && compare && compare.indexOf(value) === -1) {
-        shouldAdd = false
-      }
-    }else {
-      if(value !== compare) { // only none is Array
-        shouldAdd = false
-      }
-    }
-    return shouldAdd
-  }
-
-  static whereNotEquals(where, value, compare, json) {
-    var shouldAdd = true
-    if(where.left === 'template' || where.left === 'abe_meta.template') {
-      if (value && value.indexOf('/') > -1 && value === compare) { 
-        shouldAdd = false 
-      } else if (value && value.indexOf('/') === -1 && compare && compare.indexOf(value) !== -1) { 
-        shouldAdd = false
-      }
-    }else {
-      if(value === compare) { // only none is Array
-        shouldAdd = false
-      }
-    }
-    return shouldAdd
-  }
-
-  static whereLike(where, value, compare, json) {
-    var shouldAdd = true
-    if(where.left === 'template' || where.left === 'abe_meta.template') {
-      if(value && value.indexOf(compare) === -1) {
-        shouldAdd = false
-      }
-    }else {
-      if(value && value.indexOf(compare) === -1) {
-        shouldAdd = false
-      }
-    }
-    return shouldAdd
-  }
-
-  static whereNotLike(where, value, compare, json) {
-    var shouldAdd = true
-    if(where.left === 'template' || where.left === 'abe_meta.template') {
-      if(value && value.indexOf(compare) >= -1) {
-        shouldAdd = false
-      }
-    }else {
-      if(value && value.indexOf(compare) > -1) {
-        shouldAdd = false
-      }
-    }
-    return shouldAdd
-  }
-
->>>>>>> master
   static getWhereValuesToCompare(where, jsonDoc, jsonOriginalDoc) {
     var value
     var compare
@@ -476,7 +413,6 @@ export default class Sql {
     switch(where.operator) {
     case '=':
       var values = Sql.getWhereValuesToCompare(where, jsonDoc, jsonOriginalDoc)
-<<<<<<< HEAD
       if(values.left !== values.right) {
         isCorrect = true
       }
@@ -486,13 +422,6 @@ export default class Sql {
       if(values.left === values.right) {
         isCorrect = true
       }
-=======
-      isCorrect = Sql.whereEquals(where.left.column, values.left, values.right)
-      break
-    case '!=':
-      var values = Sql.getWhereValuesToCompare(where, jsonDoc, jsonOriginalDoc)
-      isCorrect = Sql.whereNotEquals(where.left.column, values.left, values.right)
->>>>>>> master
       break
     case '>':
       var values = Sql.getWhereValuesToCompare(where, jsonDoc, jsonOriginalDoc)
@@ -512,7 +441,6 @@ export default class Sql {
       break
     case 'LIKE':
       var values = Sql.getWhereValuesToCompare(where, jsonDoc, jsonOriginalDoc)
-<<<<<<< HEAD
       if(values.left && values.left.indexOf(values.right) === -1) {
         isCorrect = true
       }
@@ -522,13 +450,6 @@ export default class Sql {
       if(values.left && values.left.indexOf(values.right) > -1) {
         isCorrect = true
       }
-=======
-      isCorrect = Sql.whereLike(where.left.column, values.left, values.right)
-      break
-    case 'NOT LIKE':
-      var values = Sql.getWhereValuesToCompare(where, jsonDoc, jsonOriginalDoc)
-      isCorrect = Sql.whereNotLike(where.left.column, values.left, values.right)
->>>>>>> master
       break
     case 'AND':
       isLeftCorrect = Sql.recurseWhere(where.left, jsonDoc, jsonOriginalDoc)
@@ -543,11 +464,7 @@ export default class Sql {
     case 'IN':
       var valuesLeft = Sql.getWhereValuesToCompare(where, jsonDoc, jsonOriginalDoc)
       Array.prototype.forEach.call(where.right.value, (right) => {
-<<<<<<< HEAD
         if(valuesLeft.left === right.column) {
-=======
-        if (Sql.whereEquals(where.left.column, valuesLeft.left, right.column)) {
->>>>>>> master
           isCorrect = true
         }
       })
@@ -556,20 +473,12 @@ export default class Sql {
       var valuesLeft = Sql.getWhereValuesToCompare(where, jsonDoc, jsonOriginalDoc)
       isCorrect = true
       Array.prototype.forEach.call(where.right.value, (right) => {
-<<<<<<< HEAD
         if(valuesLeft.left === right.column) {
-=======
-        if (Sql.whereEquals(where.left.column, valuesLeft.left, right.column)) {
->>>>>>> master
           isCorrect = false
         }
       })
       break
     }
-<<<<<<< HEAD
-=======
-
->>>>>>> master
     return isCorrect
   }
 }
diff --git a/src/cli/core/config/config.json b/src/cli/core/config/config.json
@@ -91,7 +91,7 @@
   },
   "sessionSecret": "ThIsIsAbE",
   "abeEngine": "../views/template-engine",
-  "defaultPartials": "../../../server/views/partials",
+  "defaultPartials": "../../../../server/views/partials",
   "pluginsPartials": "partials",
   "partials": "templates/partials",
   "custom": "custom",