Filters fix

diff --git a/ipf/admin/media/js/jquery.jsuggest.js b/ipf/admin/media/js/jquery.jsuggest.js
index 74058a803026c8371d9fe1100d4ddd022f09eed8..b81c9c01612658e17915398e3403c610c528ffcd 100644 (file)
--- a/ipf/admin/media/js/jquery.jsuggest.js
+++ b/ipf/admin/media/js/jquery.jsuggest.js
@@ -126,7 +126,6 @@
                        $(jC).hide();
                        iniVal = textBox.value;
                });
-
        };
        
        $.fn.jSuggest.defaults = {

diff --git a/ipf/admin/model.php b/ipf/admin/model.php
index 4ac7e7313c870c383ce1bacee27c5d32bc37e117..7d1e555231c4d6e44ffe94d395f46e478a8ca3b0 100644 (file)
--- a/ipf/admin/model.php
+++ b/ipf/admin/model.php
@@ -9,8 +9,6 @@ class ListFilter{
     }
 
     function IsChoice($id){
-       if (!$id)
-               return false;
        foreach($this->choices as &$ch){
            if ($ch['id']==$id)
                return true;
@@ -276,7 +274,6 @@ class IPF_Admin_Model{
             $data = $o->getData();
             foreach($o->getTable()->getRelations() as $rname=>$rel){
                $pk = $rel->getTable()->getIdentifier();
-               //print $pk;
                 if (array_search($rname,$this->fields())){
                     if ($rel->getType()==IPF_ORM_Relation::MANY_AGGREGATE){
                         $data[$rname] = array();
@@ -329,8 +326,9 @@ class IPF_Admin_Model{
                $param_name = 'filter_'.$f->local;
                if (isset($request->GET[$param_name])){
                    $id = $request->GET[$param_name];
-                   if ($f->IsChoice($id))
+                   if ($f->IsChoice($id)){
                                $this->q->where($f->local.'='.$id);
+                   }
                }
        }
     }

diff --git a/ipf/auth/app.php b/ipf/auth/app.php
index f119f451f6d6a3ea24cfecc3f224c6ffb562c967..5511baebdabcb926a3b5f1a9b8a92e48cf1acc8f 100644 (file)
--- a/ipf/auth/app.php
+++ b/ipf/auth/app.php
@@ -12,7 +12,6 @@ class IPF_Auth_App extends IPF_Application{
         $request->user = $user;
         $request->session->clear();
         $request->session->setData('login_time', gmdate('Y-m-d H:i:s'));
-        $user->last_login = gmdate('Y-m-d H:i:s');
         $user->save();
     }
 

diff --git a/ipf/session/middleware.php b/ipf/session/middleware.php
index 8ee294d7e9bf18ad60a411c585048df721896f49..f70674f134ac81ccc9b8fa708b0522a84d844e05 100644 (file)
--- a/ipf/session/middleware.php
+++ b/ipf/session/middleware.php
@@ -28,7 +28,7 @@ class IPF_Session_Middleware
                 }
             } else
                 $request->user = $user;
-        } else 
+        } else
             $request->user = $user;
 
         if (isset($data['IPF_SESSION_KEY'])) {
@@ -56,7 +56,7 @@ class IPF_Session_Middleware
         }
         return $response;
     }
-    
+
     protected function _encodeData($data)
     {
         if ('' == ($key = IPF::get('secret_key'))) {
@@ -93,4 +93,4 @@ function IPF_Session_Middleware_ContextPreProcessor($request)
 
 Pluf_Signal::connect('Pluf_Template_Context_Request::construct',
                      array('Pluf_Middleware_Session', 'processContext'));
-*/                     
\ No newline at end of file
+*/
\ No newline at end of file