Merge pull request #87 from atk4/implement-mandatory-property

Implement Field->mandatory property
atk4 · Aug 4, 2016 · fba9c5a · fba9c5a
2 parents 09c76a1 + 382b6cb
commit fba9c5a
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/src/Field.php b/src/Field.php
@@ -20,7 +20,7 @@ class Field
     public $default = null;
 
     /**
-     * Field type, for example, 'string', 'boolean', 'numeric' etc.
+     * Field type, for example, 'string', 'boolean', 'numeric', 'int', 'date' etc.
      *
      * @var string
      */
@@ -54,6 +54,13 @@ class Field
      */
     public $editable = true;
 
+    /**
+     * Is field mandatory? By default fields are not mandatory.
+     *
+     * @var bool|string
+     */
+    public $mandatory = false;
+
     /**
      * Setting this to true will never actually store
      * the field in the database. It will action as normal,

diff --git a/src/Model.php b/src/Model.php
@@ -259,7 +259,12 @@ public function init()
         $this->_init();
 
         if ($this->id_field) {
-            $this->addField($this->id_field, ['system' => true, 'type' => 'int', 'editable' => false]);
+            $this->addField($this->id_field, [
+                'system'    => true,
+                'type'      => 'int',
+                'mandatory' => true,
+                'editable'  => false,
+            ]);
         }
     }
 

diff --git a/src/Relation_One.php b/src/Relation_One.php
@@ -72,6 +72,13 @@ class Relation_One
      */
     public $editable = true;
 
+    /**
+     * Is field mandatory? By default fields are not mandatory.
+     *
+     * @var bool|string
+     */
+    public $mandatory = false;
+
     /**
      * Default constructor. Will copy argument into properties.
      *
@@ -113,11 +120,12 @@ public function init()
             // but if we try to do so here, then we end up in infinite loop :(
             //$m = $this->getModel();
             $this->owner->addField($this->our_field, [
-                'type'     => 'int', //$m->getElement($m->id_field)->type,
-                'system'   => false,
-                'join'     => $this->join,
-                'default'  => $this->default,
-                'editable' => $this->editable,
+                'type'      => 'int', //$m->getElement($m->id_field)->type,
+                'system'    => false,
+                'join'      => $this->join,
+                'default'   => $this->default,
+                'editable'  => $this->editable,
+                'mandatory' => $this->mandatory,
             ]);
         }
     }