misc fixes

diff --git a/ipf/admin/model.php b/ipf/admin/model.php
index 3df342de8f8d2046313cf89638641d743b6f945c..f8d962c6e17206fa3a55cb142338917729232bfe 100644 (file)
--- a/ipf/admin/model.php
+++ b/ipf/admin/model.php
@@ -258,7 +258,6 @@ class IPF_Admin_Model{
             $this->setInlines($o, &$data);
 
             if ( ($form->isValid()) && ($this->isValidInlines()) ) {
-                #print_r($form->cleaned_data);
                 $item = $form->save();
                 $this->saveInlines($item);
                 AdminLog::logAction($request, $item, AdminLog::CHANGE);

diff --git a/ipf/admin/models/AdminLog.php b/ipf/admin/models/AdminLog.php
index f84c33d8096af95df0af2dc04d219f3f6d84eecd..85d9acc2f7aeebdb669dd2a57c899613319bcc66 100644 (file)
--- a/ipf/admin/models/AdminLog.php
+++ b/ipf/admin/models/AdminLog.php
@@ -5,19 +5,19 @@ class AdminLog extends BaseAdminLog
     const ADDITION  = 1;
     const CHANGE    = 2;
     const DELETION  = 3;
-    
+
     public static function logAction($request, $object, $action_flag, $message=''){
         $log = new AdminLog();
         $log->username = $request->user->username;
         $log->user_id = $request->user->id;
-        $log->object_id = $object->id;
+        $log->object_id = (int)$object[$object->getTable()->getIdentifier()];
         $log->object_class = get_class($object);
         $log->object_repr = (string)$object;
         $log->action_flag = $action_flag;
         $log->change_message = $message;
         $log->save();
     }
-    
+
     public function is_addition(){
         if ($this->action_flag==AdminLog::ADDITION)
             return true;
@@ -35,10 +35,10 @@ class AdminLog extends BaseAdminLog
             return true;
         return false;
     }
-    
+
     public function GetAdminUrl(){
         return IPF_HTTP_URL_urlForView('IPF_Admin_Views_Index').IPF_Utils::appLabelByModel($this->object_class).'/'.strtolower($this->object_class).'/'.$this->object_id.'/';
     }
-    
+
 }
 

diff --git a/ipf/form/field/image.php b/ipf/form/field/image.php
index ee75ee839f190bf6613c42b1a8b39c612f488141..d9a401871851870da1186c99979549210f4a1d7b 100644 (file)
--- a/ipf/form/field/image.php
+++ b/ipf/form/field/image.php
@@ -13,7 +13,6 @@ function IPF_Form_Field_moveImageToUploadFolder($value, $params=array())
 
     if(!getimagesize($image))
         throw new IPF_Exception_Form(__('An error occured when upload the image.'));
-
     return $name;
 }
 

diff --git a/ipf/form/model.php b/ipf/form/model.php
index 1a254204442b8ad2ed99d7b1cd89dee8f98c13f6..1b43ed817b7911cf6aa12c71769c0636bd89bde2 100644 (file)
--- a/ipf/form/model.php
+++ b/ipf/form/model.php
@@ -131,6 +131,7 @@ class IPF_Form_Model extends IPF_Form
                 $errors = $erecords[0]->getErrorStack();
                 foreach($errors as $k=>$v){
                     print($k);
+                    print_r($v);
                 }
             }
         }

diff --git a/ipf/orm/record.php b/ipf/orm/record.php
index 8521f5c17cf2b546b3bce61ad82706ad0791da85..3bbf7664164cc811c490d91e838367a220908e8a 100644 (file)
--- a/ipf/orm/record.php
+++ b/ipf/orm/record.php
@@ -1272,8 +1272,9 @@ abstract class IPF_ORM_Record extends IPF_ORM_Record_Abstract implements Countab
                 if (($val!==null) && ($val==''))
                     continue;
             }
-            if (array_search($key,$names))
+            if (array_search($key,$names)){
                 $this->$key = $val;
+            }
         }
     }