Sync with Kendo UI Professional

Author: kendo-bot

src/kendo.data.odata.js

@@ -108,9 +108,9 @@ var __meta__ = {
                 }
 
                 if (operator === "isnullorempty") {
-                    filter = kendo.format("{0} {1} null or {0} {1} ''", field, filter);
+                    filter = kendo.format("({0} {1} null or {0} {1} '')", field, filter);
                 } else if (operator === "isnotnullorempty") {
-                    filter = kendo.format("{0} {1} null and {0} {1} ''", field, filter);
+                    filter = kendo.format("({0} {1} null and {0} {1} '')", field, filter);
                 } else if (operator === "isnull" || operator === "isnotnull") {
                     filter = kendo.format("{0} {1} null", field, filter);
                 } else if (operator === "isempty" || operator === "isnotempty") {

tests/data/odata.js

@@ -236,7 +236,7 @@
 
         it("$filter and isnullorempty operator uses eq", function() {
             var result = parameterMap({ filter: { filters: [{ field: "Name", operator: "isnullorempty" }] } });
-            assert.equal(result.$filter, "Name eq null or Name eq ''");
+            assert.equal(result.$filter, "(Name eq null or Name eq '')");
         });
 
 
@@ -247,7 +247,7 @@
 
         it("$filter and isnotnullorempty operator uses ne", function() {
             var result = parameterMap({ filter: { filters: [{ field: "Name", operator: "isnotnullorempty" }] } });
-            assert.equal(result.$filter, "Name ne null and Name ne ''");
+            assert.equal(result.$filter, "(Name ne null and Name ne '')");
         });
 
         it("$filter with nested field", function() {