Fix '0' instead of '' default value for Lookup (#1816)

demos/_includes/Demo.php

@@ -18,6 +18,7 @@ class Demo extends \Atk4\Ui\Columns
     protected function init(): void
     {
         parent::init();
+
         $this->addClass('celled');
 
         $this->left = $this->addColumn($this->leftWidth);

demos/_includes/SomeData.php

@@ -16,13 +16,12 @@ public function __construct()
     protected function init(): void
     {
         parent::init();
-        $model = $this;
 
-        $model->addField('title');
-        $model->addField('name');
-        $model->addField('surname', ['actual' => 'name']);
-        $model->addField('date', ['type' => 'date']);
-        $model->addField('salary', ['type' => 'atk4_money', 'actual' => 'randomNumber']);
-        $model->addField('logo_url');
+        $this->addField('title');
+        $this->addField('name');
+        $this->addField('surname', ['actual' => 'name']);
+        $this->addField('date', ['type' => 'date']);
+        $this->addField('salary', ['type' => 'atk4_money', 'actual' => 'randomNumber']);
+        $this->addField('logo_url');
     }
 }

demos/basic/columns.php

@@ -72,6 +72,7 @@
     protected function init(): void
     {
         parent::init();
+
         \Atk4\Ui\Table::addTo($this, ['header' => false])
             ->setSource(['One', 'Two', 'Three', 'Four']);
     }

demos/form/form2.php

@@ -88,6 +88,7 @@
     protected function init(): void
     {
         parent::init();
+
         $this->addField('name', ['required' => true]);
         $this->addField('surname', ['ui' => ['placeholder' => 'e.g. Smith']]);
         $this->addField('gender', ['enum' => ['M', 'F']]);

demos/init-db.php

@@ -160,6 +160,7 @@ class Country extends ModelWithPrefixedFields
     protected function init(): void
     {
         parent::init();
+
         $this->addField($this->fieldName()->name, ['actual' => 'atk_afp_country__nicename', 'required' => true, 'type' => 'string']);
         $this->addField($this->fieldName()->sys_name, ['actual' => 'atk_afp_country__name', 'system' => true]);
 
@@ -307,6 +308,7 @@ class File extends ModelWithPrefixedFields
     protected function init(): void
     {
         parent::init();
+
         $this->addField($this->fieldName()->name);
 
         $this->addField($this->fieldName()->type, ['caption' => 'MIME Type']);
@@ -403,6 +405,7 @@ class Category extends ModelWithPrefixedFields
     protected function init(): void
     {
         parent::init();
+
         $this->addField($this->fieldName()->name);
 
         $this->hasMany($this->fieldName()->SubCategories, [
@@ -428,6 +431,7 @@ class SubCategory extends ModelWithPrefixedFields
     protected function init(): void
     {
         parent::init();
+
         $this->addField($this->fieldName()->name);
 
         $this->hasOne($this->fieldName()->product_category_id, [
@@ -454,6 +458,7 @@ class Product extends ModelWithPrefixedFields
     protected function init(): void
     {
         parent::init();
+
         $this->addField($this->fieldName()->name);
         $this->addField($this->fieldName()->brand);
         $this->hasOne($this->fieldName()->product_category_id, [

docs/form-control.rst

@@ -153,6 +153,7 @@ The most common use-case in large application is the use with Models. You would
         protected function init(): void
         {
             parent::init();
+
             $this->addField('name', ['actual' => 'nicename', 'required' => true, 'type' => 'string']);
             $this->addField('sys_name', ['actual' => 'name', 'system' => true]);
 

docs/form.rst

@@ -490,6 +490,7 @@ Example use of Model's validate() method::
         protected function init(): void
         {
             parent::init();
+
             $this->addField('name', ['required' => true]);
             $this->addField('surname');
             $this->addField('gender', ['enum' => ['M', 'F']]);

docs/multiline.rst

@@ -148,6 +148,7 @@ Lets use the example of demos/multiline.php::
         protected function init(): void
         {
             parent::init();
+
             $this->addField('item', ['required' => true, 'default' => 'item']);
             $this->addField('qty', ['type' => 'integer', 'caption' => 'Qty / Box', 'required' => true, 'ui' => ['multiline' => ['sui-table-cell' => ['width' => 2]]]]);
             $this->addField('box', ['type' => 'integer', 'caption' => '# of Boxes', 'required' => true, 'ui' => ['multiline' => ['sui-table-cell' => ['width' => 2]]]]);

src/CardDeck.php

@@ -94,6 +94,7 @@ class CardDeck extends View
     protected function init(): void
     {
         parent::init();
+
         $this->container = $this->add($this->container);
 
         if ($this->menu !== false) {

src/CardSection.php

@@ -22,6 +22,7 @@ class CardSection extends View
     protected function init(): void
     {
         parent::init();
+
         $this->addClass('content');
     }
 

src/Component/InlineEdit.php

@@ -72,6 +72,7 @@ class InlineEdit extends View
     protected function init(): void
     {
         parent::init();
+
         $this->cb = \Atk4\Ui\JsCallback::addTo($this);
 
         // Set default validation error handler.

src/Form.php

@@ -228,6 +228,7 @@ public function setModel(Model $model, array $fields = null): void
         // Model is set for the form and also for the current layout
         try {
             parent::setModel($model);
+
             $this->layout->setModel($model, $fields);
         } catch (Exception $e) {
             throw $e->addMoreInfo('model', $model);

src/Form/Control/Dropdown.php

@@ -215,7 +215,7 @@ protected function htmlRenderValue(): void
         // add selection only if no value is required and Dropdown has no multiple selections enabled
         if ($this->entityField !== null && !$this->entityField->getField()->required && !$this->isMultiple) {
             $this->_tItem->set('value', '');
-            $this->_tItem->set('title', $this->empty || is_numeric($this->empty) ? (string) $this->empty : '');
+            $this->_tItem->set('title', $this->empty);
             $this->template->dangerouslyAppendHtml('Item', $this->_tItem->renderToHtml());
         }
 
@@ -282,7 +282,7 @@ protected function renderView(): void
         parent::renderView();
     }
 
-    // Sets the dropdown items to the template if a model is used
+    // sets the dropdown items to the template if a model is used
     protected function _renderItemsForModel()
     {
         foreach ($this->model as $key => $row) {

src/Form/Control/Lookup.php

@@ -182,7 +182,7 @@ public function getData($limit = true): array
         }
 
         if (!$this->multiple && $this->empty) {
-            array_unshift($data, ['value' => '0', 'title' => (string) $this->empty]);
+            array_unshift($data, ['value' => '', 'title' => $this->empty]);
         }
 
         return $data;

src/Grid.php

@@ -92,6 +92,7 @@ class Grid extends View
     protected function init(): void
     {
         parent::init();
+
         $this->container = View::addTo($this, ['template' => $this->template->cloneRegion('Container')]);
         $this->template->del('Container');
 

src/HelloWorld.php

@@ -12,6 +12,7 @@ class HelloWorld extends View
     protected function init(): void
     {
         parent::init();
+
         $this->set('Content', 'Hello World');
     }
 }

src/JsSortable.php

@@ -41,6 +41,7 @@ class JsSortable extends JsCallback
     protected function init(): void
     {
         parent::init();
+
         if (!$this->view) {
             $this->view = $this->getOwner();
         }

src/LoremIpsum.php

@@ -96,6 +96,7 @@ public function __construct($defaults = null)
     protected function init(): void
     {
         parent::init();
+
         for ($x = 0; $x < $this->size; ++$x) {
             $this->addParagraph($this->generateLorem($this->words * $this->size));
         }

src/Modal.php

@@ -65,6 +65,7 @@ class Modal extends View
     protected function init(): void
     {
         parent::init();
+
         $this->getApp()->registerPortals($this);
     }
 

src/Panel/Content.php

@@ -18,6 +18,7 @@ class Content extends View implements LoadableContent
     protected function init(): void
     {
         parent::init();
+
         $this->addClass('atk-panel-content');
         $this->setCb(new Callback());
     }

src/Panel/Right.php

@@ -58,6 +58,7 @@ class Right extends View implements Loadable
     protected function init(): void
     {
         parent::init();
+
         if ($this->dynamic) {
             $this->addDynamicContent(Factory::factory($this->dynamic));
         }

src/Table/Column/ActionButtons.php

@@ -26,6 +26,7 @@ class ActionButtons extends Table\Column
     protected function init(): void
     {
         parent::init();
+
         $this->addClass('right aligned');
     }
 

src/Table/Column/ActionMenu.php

@@ -41,11 +41,6 @@ class ActionMenu extends Table\Column
     /** @var string Button icon to use for display dropdown. */
     public $icon = 'dropdown icon';
 
-    protected function init(): void
-    {
-        parent::init();
-    }
-
     public function getTag(string $position, $value, $attr = []): string
     {
         if ($this->table->hasCollapsingCssActionColumn && $position === 'body') {

src/Table/Column/Checkbox.php

@@ -30,6 +30,7 @@ public function jsChecked()
     protected function init(): void
     {
         parent::init();
+
         if (!$this->class) {
             $this->class = 'cb_' . $this->shortName;
         }

src/Table/Column/FilterModel.php

@@ -87,6 +87,7 @@ public static function factoryType(App $app, Field $field): self
     protected function init(): void
     {
         parent::init();
+
         $this->op = $this->addField('op', ['ui' => ['caption' => '']]);
 
         if (!$this->noValueField) {

src/Table/Column/KeyValue.php

@@ -46,11 +46,6 @@ class KeyValue extends Table\Column
 {
     public $values = [];
 
-    protected function init(): void
-    {
-        parent::init();
-    }
-
     /**
      * @param Field|null $field
      *

src/UserAction/ConfirmationExecutor.php

@@ -52,6 +52,7 @@ class ConfirmationExecutor extends Modal implements JsExecutorInterface
     protected function init(): void
     {
         parent::init();
+
         $this->observeChanges();
         $this->addClass($this->size);
     }

src/UserAction/ExecutorFactory.php

@@ -258,7 +258,9 @@ protected function getAddActionCaption(UserAction $action): string
         return 'Add' . ($action->getModel()->caption ? ' ' . $action->getModel()->caption : '');
     }
 
-    // Generate id for a model user action.
+    /**
+     * Generate id for a model user action.
+     */
     protected function getModelId(UserAction $action): string
     {
         return strtolower(str_replace(' ', '_', $action->getModel()->getModelCaption()));

src/UserAction/ModalExecutor.php

@@ -39,6 +39,7 @@ class ModalExecutor extends Modal implements JsExecutorInterface
     protected function init(): void
     {
         parent::init();
+
         $this->initExecutor();
     }
 

src/UserAction/PanelExecutor.php

@@ -42,6 +42,7 @@ class PanelExecutor extends Right implements JsExecutorInterface
     protected function init(): void
     {
         parent::init();
+
         $this->initExecutor();
     }
 

src/UserAction/VpExecutor.php

@@ -47,6 +47,7 @@ class VpExecutor extends View implements JsExecutorInterface
     protected function init(): void
     {
         parent::init();
+
         $this->initExecutor();
     }
 

src/View.php

@@ -215,6 +215,7 @@ protected function init(): void
     {
         $addLater = $this->_addLater;
         $this->_addLater = [];
+
         parent::init();
 
         if ($this->region && !$this->template && !$this->defaultTemplate && $this->issetOwner() && $this->getOwner()->template) {