Prefix/test also all ID fields

demos/_demo-data/create-sqlite-db.php

@@ -19,16 +19,18 @@ class ImportModelWithPrefixedFields extends Model
 {
     private function prefixFieldName(string $fieldName, bool $forActualName = false): string
     {
-        if ($fieldName === 'id') {
-            return $fieldName;
-        }
-
         return 'atk_' . ($forActualName ? 'a' : '') . 'fp_' . $this->table . '__' . $fieldName;
     }
 
     public function addField($name, $seed = []): \Atk4\Data\Field
     {
-        $seed['actual'] = $this->prefixFieldName($name, true);
+        if ($name === 'id') {
+            $this->id_field = $this->prefixFieldName($name);
+        }
+
+        $seed = \Atk4\Core\Factory::mergeSeeds($seed, [
+            'actual' => $this->prefixFieldName($name, true),
+        ]);
 
         return parent::addField($this->prefixFieldName($name), $seed);
     }

demos/_includes/DemoActionsUtil.php

@@ -10,7 +10,8 @@ public static function setupDemoActions(CountryLock $country): void
     {
         $country->addUserAction(
             'callback',
-            ['description' => 'Callback',
+            [
+                'description' => 'Callback',
                 'callback' => function ($model) {
                     return 'callback execute using country ' . $model->getTitle();
                 },

demos/collection/lister-ipp.php

@@ -50,7 +50,7 @@
     $row->iso = mb_strtolower($row->iso);
 });
 $lister->setModel(new Country($app->db))
-    ->addCondition('id', -1); // no such records so model will be empty
+    ->addCondition(Country::hinting()->fieldName()->id, -1); // no such records so model will be empty
 
 \Atk4\Ui\View::addTo($app, ['ui' => 'clearing divider']);
 \Atk4\Ui\Header::addTo($app, ['Item per page', 'subHeader' => 'Lister can display a certain amount of items']);

demos/data-action/jsactions2.php

@@ -13,7 +13,7 @@
 
 $country = new CountryLock($app->db);
 $country->tryLoadAny();
-$countryId = $country->get('id');
+$countryId = $country->get($country->id_field);
 
 // Model actions for this file are setup in DemoActionUtil.
 DemoActionsUtil::setupDemoActions($country);

demos/form/html-layout.php

@@ -41,7 +41,8 @@
 $form = Form::addTo($left, [
     'layout' => [
         Form\Layout::class,
-        ['defaultInputTemplate' => __DIR__ . '/templates/input.html',
+        [
+            'defaultInputTemplate' => __DIR__ . '/templates/input.html',
             'defaultHint' => [\Atk4\Ui\Label::class, 'class' => ['pointing', 'below']],
         ],
     ],

demos/init-db.php

@@ -27,11 +27,7 @@ class ModelWithPrefixedFields extends Model
     private function prefixFieldName(string $fieldName, bool $forActualName = false): string
     {
         if ($forActualName) {
-            $fieldName = preg_replace('~^' . preg_quote('atk_fp_' . $this->table . '__', '~') . '~', '', $fieldName);
-        }
-
-        if ($fieldName === 'id') {
-            return $fieldName;
+            $fieldName = preg_replace('~^atk_fp_' . preg_quote($this->table, '~') . '__~', '', $fieldName);
         }
 
         return 'atk_' . ($forActualName ? 'a' : '') . 'fp_' . $this->table . '__' . $fieldName;
@@ -46,6 +42,19 @@ protected function createHintablePropsFromClassDoc(string $className): array
         }, parent::createHintablePropsFromClassDoc($className));
     }
 
+    protected function init(): void
+    {
+        if ($this->id_field === 'id') {
+            $this->id_field = $this->prefixFieldName($this->id_field);
+        }
+
+        if ($this->title_field === 'name') {
+            $this->title_field = $this->prefixFieldName($this->title_field);
+        }
+
+        parent::init();
+    }
+
     public function addField($name, $seed = []): \Atk4\Data\Field
     {
         $seed = \Atk4\Core\Factory::mergeSeeds($seed, [
@@ -87,7 +96,6 @@ public function lock(): void
 class Country extends ModelWithPrefixedFields
 {
     public $table = 'country';
-    public $title_field = 'atk_fp_country__name';
 
     protected function init(): void
     {
@@ -248,7 +256,6 @@ class Percent extends \Atk4\Data\Field
 class File extends ModelWithPrefixedFields
 {
     public $table = 'file';
-    public $title_field = 'atk_fp_file__name';
 
     protected function init(): void
     {
@@ -258,10 +265,15 @@ protected function init(): void
         $this->addField($this->fieldName()->type, ['caption' => 'MIME Type']);
         $this->addField($this->fieldName()->is_folder, ['type' => 'boolean']);
 
-        $this->hasMany($this->fieldName()->SubFolder, ['model' => [self::class], 'their_field' => self::hinting()->fieldName()->parent_folder_id])
+        $this->hasMany($this->fieldName()->SubFolder, [
+            'model' => [self::class],
+            'their_field' => self::hinting()->fieldName()->parent_folder_id,
+        ])
             ->addField($this->fieldName()->count, ['aggregate' => 'count', 'field' => $this->persistence->expr($this, '*')]);
 
-        $this->hasOne($this->fieldName()->parent_folder_id, ['model' => [Folder::class]])
+        $this->hasOne($this->fieldName()->parent_folder_id, [
+            'model' => [Folder::class],
+        ])
             ->addTitle();
     }
 
@@ -332,15 +344,20 @@ protected function init(): void
 class Category extends ModelWithPrefixedFields
 {
     public $table = 'product_category';
-    public $title_field = 'atk_fp_product_category__name';
 
     protected function init(): void
     {
         parent::init();
         $this->addField($this->fieldName()->name);
 
-        $this->hasMany($this->fieldName()->SubCategories, ['model' => [SubCategory::class], 'their_field' => SubCategory::hinting()->fieldName()->product_category_id]);
-        $this->hasMany($this->fieldName()->Products, ['model' => [Product::class], 'their_field' => Product::hinting()->fieldName()->product_category_id]);
+        $this->hasMany($this->fieldName()->SubCategories, [
+            'model' => [SubCategory::class],
+            'their_field' => SubCategory::hinting()->fieldName()->product_category_id,
+        ]);
+        $this->hasMany($this->fieldName()->Products, [
+            'model' => [Product::class],
+            'their_field' => Product::hinting()->fieldName()->product_category_id,
+        ]);
     }
 }
 
@@ -352,15 +369,19 @@ protected function init(): void
 class SubCategory extends ModelWithPrefixedFields
 {
     public $table = 'product_sub_category';
-    public $title_field = 'atk_fp_product_sub_category__name';
 
     protected function init(): void
     {
         parent::init();
         $this->addField($this->fieldName()->name);
 
-        $this->hasOne($this->fieldName()->product_category_id, ['model' => [Category::class]]);
-        $this->hasMany($this->fieldName()->Products, ['model' => [Product::class], 'their_field' => Product::hinting()->fieldName()->product_sub_category_id]);
+        $this->hasOne($this->fieldName()->product_category_id, [
+            'model' => [Category::class],
+        ]);
+        $this->hasMany($this->fieldName()->Products, [
+            'model' => [Product::class],
+            'their_field' => Product::hinting()->fieldName()->product_sub_category_id,
+        ]);
     }
 }
 
@@ -373,15 +394,18 @@ protected function init(): void
 class Product extends ModelWithPrefixedFields
 {
     public $table = 'product';
-    public $title_field = 'atk_fp_product__name';
 
     protected function init(): void
     {
         parent::init();
         $this->addField($this->fieldName()->name);
         $this->addField($this->fieldName()->brand);
-        $this->hasOne($this->fieldName()->product_category_id, ['model' => [Category::class]])->addTitle();
-        $this->hasOne($this->fieldName()->product_sub_category_id, ['model' => [SubCategory::class]])->addTitle();
+        $this->hasOne($this->fieldName()->product_category_id, [
+            'model' => [Category::class],
+        ])->addTitle();
+        $this->hasOne($this->fieldName()->product_sub_category_id, [
+            'model' => [SubCategory::class],
+        ])->addTitle();
     }
 }
 

src/UserAction/ConfirmationExecutor.php

@@ -164,7 +164,7 @@ public function doConfirmation(View $modal)
                         $this->loader->jsload(
                             [
                                 'step' => 'exec',
-                                $this->name => $this->action->getOwner()->get('id'),
+                                $this->name => $this->action->getOwner()->getId(),
                             ],
                             ['method' => 'post']
                         ),

src/UserAction/JsCallbackExecutor.php

@@ -71,8 +71,8 @@ public function setAction(Model\UserAction $action, $urlArgs = [])
         }
 
         $this->set(function ($j) {
-            // may be id is pass within $post args.
-            $id = $_POST['c0'] ?? $_POST[$this->action->getOwner()->id_field] ?? null;
+            // may be id is passed as 'id' or model->id_field within $post args.
+            $id = $_POST['c0'] ?? $_POST['id'] ?? $_POST[$this->action->getOwner()->id_field] ?? null;
             if ($id && $this->action->appliesTo === Model\UserAction::APPLIES_TO_SINGLE_RECORD) {
                 $this->action->getOwner()->tryLoad($id);
             }

src/UserAction/ModalExecutor.php

@@ -345,7 +345,7 @@ protected function doPreview(View $modal)
         if ($prev = $this->getPreviousStep($this->step)) {
             $chain = $this->loader->jsload([
                 'step' => $prev,
-                $this->name => $this->action->getOwner()->get('id'),
+                $this->name => $this->action->getOwner()->getId(),
             ], ['method' => 'post'], $this->loader->name);
 
             $modal->js(true, $this->prevStepBtn->js()->on('click', new JsFunction([$chain])));
@@ -361,7 +361,7 @@ protected function doPreview(View $modal)
                         $this->loader->jsload(
                             [
                                 'step' => 'final',
-                                $this->name => $this->action->getOwner()->get('id'),
+                                $this->name => $this->action->getOwner()->getId(),
                             ],
                             ['method' => 'post'],
                             $this->loader->name
@@ -552,7 +552,7 @@ protected function jsStepSubmit(string $step)
                     $this->loader->jsAddStoreData($this->actionData, true),
                     $this->loader->jsload([
                         'step' => $this->getNextStep($step),
-                        $this->name => $this->action->getOwner()->get('id'),
+                        $this->name => $this->action->getOwner()->getId(),
                     ], ['method' => 'post'], $this->loader->name),
                 ];
             }
@@ -648,7 +648,7 @@ protected function jsSetPrevHandler(View $view, string $step)
         if ($prev = $this->getPreviousStep($step)) {
             $chain = $this->loader->jsload([
                 'step' => $prev,
-                $this->name => $this->action->getOwner()->get('id'),
+                $this->name => $this->action->getOwner()->getId(),
             ], ['method' => 'post'], $this->loader->name);
 
             $view->js(true, $this->prevStepBtn->js()->on('click', new JsFunction([$chain])));