[Fmsystem-commits] [8528] property: more on bulk update

[Sigurd Nes]

Revision: 8528
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8528
Author:   sigurdne
Date:     2012-01-09 08:25:23 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
property: more on bulk update

Modified Paths:
--------------
    trunk/property/inc/class.soproject.inc.php
    trunk/property/inc/class.uiproject.inc.php

Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php  2012-01-09 06:37:06 UTC (rev 
8527)
+++ trunk/property/inc/class.soproject.inc.php  2012-01-09 08:25:23 UTC (rev 
8528)
@@ -1376,7 +1376,7 @@
                        $this->db->transaction_begin();
                        foreach ($ids as $id)
                        {
-                               $this->db->query("SELECT status, vendor_id FROM 
fm_project WHERE id = '{$id}'",__LINE__,__FILE__);
+                               $this->db->query("SELECT status FROM fm_project 
WHERE id = '{$id}'",__LINE__,__FILE__);
                                $this->db->next_record();
                                $old_status     = $this->db->f('status');
 
@@ -1384,6 +1384,7 @@
                                {
                                        $this->db->query("UPDATE fm_project SET 
status = '{$status_new}' WHERE id = '{$id}'",__LINE__,__FILE__);
                                        $historylog->add('S', $id, $status_new, 
$old_status);
+                                       $historylog->add('RM', $id,'Status 
endret via masseoppdatering');
                                }
 
                                $action_params_approved = array
@@ -1430,6 +1431,7 @@
                                {
                                        $this->db->query("UPDATE fm_workorder 
SET status = '{$status_new}' WHERE id = '{$id}'",__LINE__,__FILE__);
                                        $historylog->add('S', $id, $status_new, 
$old_status);
+                                       $historylog->add('RM', $id,'Status 
endret via masseoppdatering');
                                }
 
                                $action_params_approved = array

Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php  2012-01-09 06:37:06 UTC (rev 
8527)
+++ trunk/property/inc/class.uiproject.inc.php  2012-01-09 08:25:23 UTC (rev 
8528)
@@ -1974,12 +1974,19 @@
                        $status_filter  = phpgw::get_var('status_filter');
                        $status_new     = phpgw::get_var('status_new');
                        $type                   = phpgw::get_var('type');
-                       $user_id                = phpgw::get_var('user_id', 
'int');
                        $id_to_update   = phpgw::get_var('id_to_update');
                        $paid                   = phpgw::get_var('paid', 
'bool', 'POST');
                        $closed_orders  = phpgw::get_var('closed_orders', 
'bool', 'POST');
-
                        
+                       if(isset($_POST['user_id']))
+                       {
+                               $user_id        = phpgw::get_var('user_id', 
'int');
+                       }
+                       else
+                       {
+                               $user_id        = $this->account;
+                       }
+                       
                        if($id_to_update)
                        {
                                $ids = 
array_values(explode(',',trim($id_to_update,',')));
@@ -2043,7 +2050,7 @@
                                                                                
                                ))
                                );
 
-                       $user_list      = 
$this->bocommon->get_user_list('select',$user_id,$extra=false,$default=false,$start=-1,$sort='ASC',$order='account_lastname',$query='',$offset=-1);
+                       $user_list      = 
$this->bocommon->get_user_list('select', $user_id, $extra=false, $default = 
$user_id, $start=-1, $sort='ASC', 
$order='account_lastname',$query='',$offset=-1);
                        foreach ($user_list as &$entry)
                        {
                                $entry['id'] = $entry['user_id'];