changeset a6faf12f1d3e in sao:default
details: https://hg.tryton.org/sao?cmd=changeset&node=a6faf12f1d3e
description:
        Pass all arguments when evaluate And/Or PYSON

        issue10327
        review338201002
diffstat:

 src/pyson.js |  8 ++++----
 tests/sao.js |  6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (41 lines):

diff -r 180b104a98dd -r a6faf12f1d3e src/pyson.js
--- a/src/pyson.js      Fri Apr 23 20:25:05 2021 +0200
+++ b/src/pyson.js      Fri Apr 23 20:34:44 2021 +0200
@@ -267,8 +267,8 @@
     };
 
 
-    Sao.PYSON.eval.And = function(statements) {
-        return Sao.PYSON.And.new_(statements);
+    Sao.PYSON.eval.And = function() {
+        return Sao.PYSON.And.new_(arguments);
     };
     Sao.PYSON.And = Sao.class_(Sao.PYSON.PYSON, {
         init: function() {
@@ -317,8 +317,8 @@
     };
 
 
-    Sao.PYSON.eval.Or = function(statements) {
-        return Sao.PYSON.Or.new_(statements);
+    Sao.PYSON.eval.Or = function() {
+        return Sao.PYSON.Or.new_(arguments);
     };
     Sao.PYSON.Or = Sao.class_(Sao.PYSON.And, {
         pyson: function() {
diff -r 180b104a98dd -r a6faf12f1d3e tests/sao.js
--- a/tests/sao.js      Fri Apr 23 20:25:05 2021 +0200
+++ b/tests/sao.js      Fri Apr 23 20:34:44 2021 +0200
@@ -1234,6 +1234,12 @@
     QUnit.test('PYSON eval', function() {
         QUnit.strictEqual(eval_pyson('True'), true, "eval_pyson('True')");
         QUnit.strictEqual(eval_pyson('False'), false, "eval_pyson('False')");
+        QUnit.strictEqual(
+            eval_pyson('And(True, True).toString()'),
+            "And(true, true)", "eval_pyson('And(True, True)').toString()");
+        QUnit.strictEqual(
+            eval_pyson('Or(True, False).toString()'),
+            "Or(true, false)", "eval_pyson('Or(True, False)').toString()");
     });
 
     QUnit.test('DomainParser.group_operator', function() {

Reply via email to