[Fmsystem-commits] [14894] tts: initial filter on assigned to me

[Sigurd Nes]

Revision: 14894
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14894
Author:   sigurdne
Date:     2016-04-06 13:18:39 +0000 (Wed, 06 Apr 2016)
Log Message:
-----------
tts: initial filter on assigned to me

Modified Paths:
--------------
    trunk/property/inc/class.sotts.inc.php
    trunk/property/inc/class.uitts.inc.php

Modified: trunk/property/inc/class.sotts.inc.php
===================================================================
--- trunk/property/inc/class.sotts.inc.php      2016-04-06 13:16:59 UTC (rev 
14893)
+++ trunk/property/inc/class.sotts.inc.php      2016-04-06 13:18:39 UTC (rev 
14894)
@@ -114,7 +114,7 @@
                {
                        $start = isset($data['start']) && $data['start'] ? 
(int)$data['start'] : 0;
                        $status_id = isset($data['status_id']) && 
$data['status_id'] ? $data['status_id'] : 'O'; //O='Open'
-                       $user_id = isset($data['user_id']) && $data['user_id'] 
? (int)$data['user_id'] : 0;
+                       $user_id = isset($data['user_id']) && $data['user_id'] 
? abs((int)$data['user_id']) : 0;
                        $reported_by = isset($data['reported_by']) && 
$data['reported_by'] ? (int)$data['reported_by'] : 0;
                        $query = isset($data['query']) ? $data['query'] : '';
                        $sort = isset($data['sort']) && $data['sort'] ? 
$data['sort'] : 'DESC';

Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php      2016-04-06 13:16:59 UTC (rev 
14893)
+++ trunk/property/inc/class.uitts.inc.php      2016-04-06 13:18:39 UTC (rev 
14894)
@@ -681,8 +681,11 @@
                                );
 
                                $values_combo_box[4] = 
$this->bocommon->get_user_list_right2('filter', PHPGW_ACL_EDIT, $this->user_id, 
$this->acl_location);
-                               array_unshift($values_combo_box[4], array('id' 
=> $GLOBALS['phpgw_info']['user']['account_id'],
-                                       'name' => lang('my assigned tickets')));
+                               array_unshift($values_combo_box[4], array(
+                                       'id' => -1 * 
$GLOBALS['phpgw_info']['user']['account_id'],
+                                       'name' => lang('my assigned tickets'),
+                                       'selected'      => (int)$this->user_id 
<= 0 ? 1 : 0));
+
                                array_unshift($values_combo_box[4], array('id' 
=> '', 'name' => lang('assigned to')));
                                $combos[] = array('type' => 'filter',
                                        'name' => 'user_id',