From c3ed58532e9fa08af301b830df9ca1c95e7212dc Mon Sep 17 00:00:00 2001 From: DarkSide Date: Thu, 28 Nov 2019 20:48:17 +0200 Subject: [PATCH 1/5] fix one test --- tests/DeepCopyTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/DeepCopyTest.php b/tests/DeepCopyTest.php index ce2163a9c..87a4c788e 100644 --- a/tests/DeepCopyTest.php +++ b/tests/DeepCopyTest.php @@ -88,7 +88,7 @@ public function init() $this->addField('vat', ['type'=>'numeric', 'default'=>0.21]); // total is calculated with VAT - $this->addExpression('total', '[qty]*[price]*(1+vat)'); + $this->addExpression('total', '[qty]*[price]*(1+[vat])'); } } From 14633d51e298c8cea4a2b6d975595fea81c04c32 Mon Sep 17 00:00:00 2001 From: Autocommit Date: Thu, 28 Nov 2019 18:49:17 +0000 Subject: [PATCH 2/5] Setting current dependencies --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 2d5c88d43..69643a6d0 100644 --- a/composer.json +++ b/composer.json @@ -14,12 +14,12 @@ ], "require": { "php": ">=7.2.0", - "atk4/core": "dev-develop", - "atk4/dsql": "dev-develop", - "ext-intl": "*" + "ext-intl": "*", + "atk4/core": "^1.3", + "atk4/dsql": "^1.2" }, "require-dev": { - "atk4/schema": "dev-develop", + "atk4/schema": "*", "phpunit/phpunit": "<6", "phpunit/dbunit": ">=1.2", "phpunit/phpcov": "*", From edc8a3115815c21e58cde6481ba94f234d70eeab Mon Sep 17 00:00:00 2001 From: Georgi Hristov Date: Sun, 1 Dec 2019 08:38:31 +0100 Subject: [PATCH 3/5] use custom exec button on edit action --- src/Model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Model.php b/src/Model.php index 14e9e20d3..489b702e8 100644 --- a/src/Model.php +++ b/src/Model.php @@ -416,7 +416,7 @@ public function init() 'fields' => true, 'scope' => UserAction\Generic::SINGLE_RECORD, 'callback'=> 'save', - 'ui' => ['icon'=>'edit', 'button'=>[null, 'icon'=>'edit']], + 'ui' => ['icon'=>'edit', 'button'=>[null, 'icon'=>'edit'], 'execButton'=>new Button(['Save', 'blue'])], ]); $this->addAction('delete', [ 'scope' => UserAction\Generic::SINGLE_RECORD, From 429c7e0fe35c9569d016eec7078322f5db743054 Mon Sep 17 00:00:00 2001 From: Imants Horsts Date: Fri, 6 Dec 2019 00:48:17 +0200 Subject: [PATCH 4/5] Update Model.php --- src/Model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Model.php b/src/Model.php index 3931c0b87..d096cbb24 100644 --- a/src/Model.php +++ b/src/Model.php @@ -416,7 +416,7 @@ public function init() 'fields' => true, 'scope' => UserAction\Generic::SINGLE_RECORD, 'callback'=> 'save', - 'ui' => ['icon'=>'edit', 'button'=>[null, 'icon'=>'edit'], 'execButton'=>new Button(['Save', 'blue'])], + 'ui' => ['icon'=>'edit', 'button'=>[null, 'icon'=>'edit'], 'execButton'=>new \atk4\ui\Button(['Save', 'blue'])], ]); $this->addAction('delete', [ 'scope' => UserAction\Generic::SINGLE_RECORD, From 5a0dac152c5b8943a26c7827f8c2b4ac78a87819 Mon Sep 17 00:00:00 2001 From: Imants Horsts Date: Tue, 10 Dec 2019 19:07:47 +0200 Subject: [PATCH 5/5] remove class, use seed --- src/Model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Model.php b/src/Model.php index d096cbb24..33418198e 100644 --- a/src/Model.php +++ b/src/Model.php @@ -416,7 +416,7 @@ public function init() 'fields' => true, 'scope' => UserAction\Generic::SINGLE_RECORD, 'callback'=> 'save', - 'ui' => ['icon'=>'edit', 'button'=>[null, 'icon'=>'edit'], 'execButton'=>new \atk4\ui\Button(['Save', 'blue'])], + 'ui' => ['icon'=>'edit', 'button'=>[null, 'icon'=>'edit'], 'execButton'=>['Button', 'Execute']], ]); $this->addAction('delete', [ 'scope' => UserAction\Generic::SINGLE_RECORD,