From 32e02262dad96aeb724dadbadfaf563324f1e6a6 Mon Sep 17 00:00:00 2001 From: hunter Date: Fri, 10 Oct 2008 18:22:32 +0300 Subject: [PATCH] fix inlines --- ipf/admin/model.php | 2 +- ipf/admin/modelinline.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ipf/admin/model.php b/ipf/admin/model.php index 72a2c65..06ea090 100644 --- a/ipf/admin/model.php +++ b/ipf/admin/model.php @@ -233,7 +233,7 @@ class IPF_Admin_Model{ $this->setInlines($o, &$data); if ( ($form->isValid()) && ($this->isValidInlines()) ) { - //print_r($form->cleaned_data); + #print_r($form->cleaned_data); $item = $form->save(); $this->saveInlines($item); AdminLog::logAction($request, $item, AdminLog::CHANGE); diff --git a/ipf/admin/modelinline.php b/ipf/admin/modelinline.php index f30101e..b865a29 100644 --- a/ipf/admin/modelinline.php +++ b/ipf/admin/modelinline.php @@ -111,8 +111,6 @@ abstract class IPF_Admin_ModelInline{ function save($parent_obj){ - $fk_name = $this->getFkName(); - if ($this->parentModel->exists()){ $objects = IPF_ORM_Query::create() ->from(get_class($this->model)) @@ -137,6 +135,7 @@ abstract class IPF_Admin_ModelInline{ unset($form->cleaned_data[$fname]); } } + $obj->synchronizeWithArray($form->cleaned_data); $obj->save(); } @@ -146,11 +145,12 @@ abstract class IPF_Admin_ModelInline{ } } + $fk_local = $this->getFkLocal(); foreach($this->formset as $form){ if ($form->isValid()){ if ($form->isAdd){ unset($form->cleaned_data[0]); - $form->cleaned_data[$fk_name] = $parent_obj; + $form->cleaned_data[$fk_local] = $parent_obj->id; $form->save(); } } -- 2.49.0