atk4
diff --git a/‎.github/workflows/bundler.yml‎
Lines changed: 0 additions & 3 deletions b/‎.github/workflows/bundler.yml‎
Lines changed: 0 additions & 3 deletions
diff --git a/‎demos/card-action.php‎
Lines changed: 5 additions & 5 deletions b/‎demos/card-action.php‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎demos/card-deck.php‎
Lines changed: 2 additions & 2 deletions b/‎demos/card-deck.php‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎demos/database.php‎
Lines changed: 6 additions & 6 deletions b/‎demos/database.php‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎demos/dropdown-plus.php‎
Lines changed: 5 additions & 5 deletions b/‎demos/dropdown-plus.php‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎demos/field.php‎
Lines changed: 1 addition & 1 deletion b/‎demos/field.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎demos/field2.php‎
Lines changed: 15 additions & 15 deletions b/‎demos/field2.php‎
Lines changed: 15 additions & 15 deletions
diff --git a/‎demos/form.php‎
Lines changed: 1 addition & 1 deletion b/‎demos/form.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎demos/grid_action.php‎
Lines changed: 1 addition & 1 deletion b/‎demos/grid_action.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎demos/jsactionsgrid.php‎
Lines changed: 9 additions & 9 deletions b/‎demos/jsactionsgrid.php‎
Lines changed: 9 additions & 9 deletions
@@ -44,9 +44,6 @@ jobs:
           pr_assignee: "romaninsh"
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
-
-
-
       - name: Update to stable dependencies
         run: |
           jq 'del(."minimum-stability")|del(.require["atk4/data"])' < composer.json > tmp && mv tmp composer.json
 
@@ -24,12 +24,12 @@
 $client = $stats->ref('client_country_iso')->loadAny();
 $notify = $client->addAction('Notify',
                    ['args' => [
-                        'note'=> ['type'=>'string', 'required'=>true],
+                       'note'=> ['type'=>'string', 'required'=>true],
                    ],
-                   'callback' => function ($m) {
-                       return 'Note to client is sent.';
-                   },
-]);
+                       'callback' => function ($m) {
+                           return 'Note to client is sent.';
+                       },
+                   ]);
 
 $c->addSection('Client Country:', $client, ['iso', 'numcode', 'phonecode'], true);
 
 
@@ -15,7 +15,7 @@
 });
 
 $action = $countries->addAction('book', [
-    'callback' => function ($m, $city, $email) {
+    'callback' => function ($m, $email, $city) {
         return 'Your request to visit '.ucwords($city).' in '.$m->get('name').' was sent to: '.$email;
     },
     'ui' => ['button'=>[null, 'icon'=>'plane']],
@@ -33,7 +33,7 @@
     },
     'scope' => 'none',
     'ui'    => ['button' => ['Request Info', 'ui' => 'button primary', 'icon' => 'mail']],
-    ]);
+]);
 
 $info_action->args = [
     'email'  => ['type'=>'email', 'required'=>true, 'caption' => 'Please let us know your email address:'],
 
@@ -9,8 +9,8 @@
     }
 } catch (PDOException $e) {
     throw new \atk4\ui\Exception([
-                                     'This demo requires access to the database. See "demos/database.php"',
-                                 ], null, $e);
+        'This demo requires access to the database. See "demos/database.php"',
+    ], null, $e);
 }
 
 $app->db = $db;
@@ -159,10 +159,10 @@ public function importFromFilesystem($path)
                 $this->unload();
 
                 $this->save([
-                                'name'      => $fileinfo->getFilename(),
-                                'is_folder' => $fileinfo->isDir(),
-                                'type'      => pathinfo($fileinfo->getFilename(), PATHINFO_EXTENSION),
-                            ]);
+                    'name'      => $fileinfo->getFilename(),
+                    'is_folder' => $fileinfo->isDir(),
+                    'type'      => pathinfo($fileinfo->getFilename(), PATHINFO_EXTENSION),
+                ]);
 
                 if ($fileinfo->isDir()) {
                     $this->ref('SubFolder')->importFromFilesystem($path.'/'.$fileinfo->getFilename());
 
@@ -19,8 +19,8 @@
                     'model'             => new Country($db),
                     'renderRowFunction' => function ($row) {
                         return [
-                          'value' => $row->id,
-                          'title' => $row->getTitle().' ('.$row->get('iso3').')',
+                            'value' => $row->id,
+                            'title' => $row->getTitle().' ('.$row->get('iso3').')',
                         ];
                     },
                 ]);
@@ -32,9 +32,9 @@
                     'model'             => new File($db),
                     'renderRowFunction' => function ($row) {
                         return [
-                          'value' => $row->id,
-                          'title' => $row->getTitle(),
-                          'icon'  => $row->get('is_folder') ? 'folder' : 'file',
+                            'value' => $row->id,
+                            'title' => $row->getTitle(),
+                            'icon'  => $row->get('is_folder') ? 'folder' : 'file',
                         ];
                     },
                 ]);
 
@@ -80,7 +80,7 @@
 ])]));
 
 $app->add(new \atk4\ui\FormField\Line(['action' => new \atk4\ui\Button([
-   'icon' => 'search',
+    'icon' => 'search',
 ])]));
 
 $app->add(new \atk4\ui\Header(['Modifiers', 'size' => 2]));
 
@@ -27,11 +27,11 @@
 
 $g = $f->addGroup('DropDown');
 $values = [
-            'tag'        => ['Tag', 'icon' => 'tag icon'],
-            'globe'      => ['Globe', 'icon' => 'globe icon'],
-            'registered' => ['Registered', 'icon' => 'registered icon'],
-            'file'       => ['File', 'icon' => 'file icon'],
-        ];
+    'tag'        => ['Tag', 'icon' => 'tag icon'],
+    'globe'      => ['Globe', 'icon' => 'globe icon'],
+    'registered' => ['Registered', 'icon' => 'registered icon'],
+    'file'       => ['File', 'icon' => 'file icon'],
+];
 $g->addField('d_norm', [new \atk4\ui\FormField\DropDown(['values' => $values]), 'width'=>'three'])->set('globe');
 $g->addField('d_read', [new \atk4\ui\FormField\DropDown(['values' => $values]), 'readonly' => true, 'width'=>'three'])->set('globe'); // allows to change value
 $g->addField('d_disb', [new \atk4\ui\FormField\DropDown(['values' => $values]), 'disabled' => true, 'width'=>'three'])->set('globe'); // css disabled, but can focus with Tab and change value
@@ -172,21 +172,21 @@
 
 $g = $form->addGroup('DropDown');
 $d1 = $g->addField('d1', new \atk4\ui\FormField\DropDown(['values' => [
-            'tag'        => ['Tag', 'icon' => 'tag icon'],
-            'globe'      => ['Globe', 'icon' => 'globe icon'],
-            'registered' => ['Registered', 'icon' => 'registered icon'],
-            'file'       => ['File', 'icon' => 'file icon'],
-        ],
+    'tag'        => ['Tag', 'icon' => 'tag icon'],
+    'globe'      => ['Globe', 'icon' => 'globe icon'],
+    'registered' => ['Registered', 'icon' => 'registered icon'],
+    'file'       => ['File', 'icon' => 'file icon'],
+],
 ]));
 $d1->onChange('console.log("d1 changed")');
 
 $g = $form->addGroup('Radio');
 $r1 = $g->addField('r1', new \atk4\ui\FormField\Radio(['values' => [
-            'Tag',
-            'Globe',
-            'Registered',
-            'File',
-        ],
+    'Tag',
+    'Globe',
+    'Registered',
+    'File',
+],
 ]));
 $r1->onChange('console.log("r1 changed")');
 
 
@@ -197,7 +197,7 @@
 $f->onSubmit(function ($f) {
     $errors = [];
 
-    foreach ($f->model->elements as $name => $ff) {
+    foreach ($f->model->getFields() as $name => $ff) {
         if ($name == 'id') {
             continue;
         }
 
@@ -32,7 +32,7 @@
             $g->table->jsRemoveRow($model->get('id')),
         ];
     },
-   ]
+]
 );
 
 $del_action = $country->addAction('delete', [
 
@@ -83,15 +83,15 @@
 $g->addActionMenuItem($model_header);
 $g->addActionMenuItems(
     [
-       'callback',
-       'preview',
-       'disabled_action',
-       'edit_argument',
-       'edit_argument_prev',
-       'edit_iso',
-       'Ouch',
-       'confirm',
-   ]
+        'callback',
+        'preview',
+        'disabled_action',
+        'edit_argument',
+        'edit_argument_prev',
+        'edit_iso',
+        'Ouch',
+        'confirm',
+    ]
 );
 
 $special_item = $app->factory('View', ['id' => false, 'class' => ['item'], 'content' => 'Multi Step'], 'atk4\ui');
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@`
`197`	`197`	`$f->onSubmit(function ($f) {`
`198`	`198`	`$errors = [];`
`199`	`199`
`200`		`- foreach ($f->model->elements as $name => $ff) {`
	`200`	`+ foreach ($f->model->getFields() as $name => $ff) {`
`201`	`201`	`if ($name == 'id') {`
`202`	`202`	`continue;`
`203`	`203`	`}`