From: Andrey Kutejko <andy128k@gmail.com>
Date: Mon, 15 Jul 2013 22:37:09 +0000 (+0300)
Subject: fix owned template
X-Git-Tag: 0.6~89
X-Git-Url: https://git.andy128k.dev/?a=commitdiff_plain;h=2532192fc4ad35e41ef97396b6020677e8c13d75;p=ipf-legacy-orm.git

fix owned template
---

diff --git a/ipf/orm/template/listener/owned.php b/ipf/orm/template/listener/owned.php
index a968232..7c99b69 100644
--- a/ipf/orm/template/listener/owned.php
+++ b/ipf/orm/template/listener/owned.php
@@ -11,15 +11,15 @@ class IPF_ORM_Template_Listener_Owned
 
     public function preInsert(IPF_ORM_Event $event)
     {
-        $this->setOrderValue($event->getInvoker());
+        $this->setOwner($event->getInvoker());
     }
 
     public function preUpdate(IPF_ORM_Event $event)
     {
-        $this->setOrderValue($event->getInvoker());
+        $this->setOwner($event->getInvoker());
     }
 
-    private function setOrderValue($obj)
+    private function setOwner($obj)
     {
         $columnName = $this->columnName;
         if ($obj->$columnName)
diff --git a/ipf/orm/template/owned.php b/ipf/orm/template/owned.php
index 40ce263..dbe2a96 100644
--- a/ipf/orm/template/owned.php
+++ b/ipf/orm/template/owned.php
@@ -30,11 +30,14 @@ class IPF_ORM_Template_Owned extends IPF_ORM_Template
     {
         $this->hasColumn($this->columnName, 'integer', null, array(
             'exclude'   => $this->exclude,
-            'notblank'  => true,
-            'notnull'   => true,
             'verbose'   => $this->verbose,
         ));
-        $this->hasOne('User as '.$this->name, array('local' => $this->columnName, 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+        $this->hasOne('User as '.$this->name, array(
+            'local'     => $this->columnName,
+            'exclude'   => $this->exclude,
+            'foreign'   => 'id',
+            'onDelete'  => 'CASCADE',
+        ));
         $this->getTable()->listeners['Owned_'.$this->columnName] = new IPF_ORM_Template_Listener_Owned($this->columnName);
     }
 }