[Fmsystem-commits] [6814] property: split assigned/submitted tickets

[Sigurd Nes]

Revision: 6814
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6814
Author:   sigurdne
Date:     2011-01-20 18:41:26 +0000 (Thu, 20 Jan 2011)
Log Message:
-----------
property: split assigned/submitted tickets

Modified Paths:
--------------
    trunk/property/inc/class.uitts.inc.php
    trunk/property/setup/phpgw_no.lang

Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php      2011-01-20 15:26:39 UTC (rev 
6813)
+++ trunk/property/inc/class.uitts.inc.php      2011-01-20 18:41:26 UTC (rev 
6814)
@@ -513,8 +513,18 @@
                                        array_unshift 
($values_combo_box[1],$default_value);
 
                                        $values_combo_box[3]  = 
$this->bocommon->get_user_list_right2('filter',PHPGW_ACL_EDIT,$this->user_id,$this->acl_location);
-                                       array_unshift 
($values_combo_box[3],array('id'=>$GLOBALS['phpgw_info']['user']['account_id'],'name'=>lang('mine
 assigned tickets')));
-                                       array_unshift 
($values_combo_box[3],array('id'=> (-1 * 
$GLOBALS['phpgw_info']['user']['account_id']),'name'=>lang('mine submitted 
tickets')));
+                                       array_unshift 
($values_combo_box[3],array('id'=>$GLOBALS['phpgw_info']['user']['account_id'],'name'=>lang('my
 assigned tickets')));
+                                       $_my_negative_self = (-1 * 
$GLOBALS['phpgw_info']['user']['account_id']);
+       
+                                       $default_value = array
+                                       (
+                                               'id'            => 
$_my_negative_self,
+                                               'name'          => lang('my 
submitted tickets'),
+                                               'selected'      => 
$_my_negative_self == $this->user_id
+                                       );
+                                       unset($_my_negative_self);
+                                       array_unshift 
($values_combo_box[3],$default_value);
+
                                        $default_value = 
array('id'=>'','name'=>lang('no user'));
                                        array_unshift 
($values_combo_box[3],$default_value);
 
@@ -3144,6 +3154,7 @@
                                $tab = 'general';
                        }
 
+
                        $tabs = array
                                (
                                        'general'               => 
array('label' => lang('general'), 'link' => '#general')

Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang  2011-01-20 15:26:39 UTC (rev 6813)
+++ trunk/property/setup/phpgw_no.lang  2011-01-20 18:41:26 UTC (rev 6814)
@@ -1023,6 +1023,8 @@
 multiple checkbox      property        no      Flervalgs avkrysningsknapp
 multiple radio property        no      Flervalgs radioknapp
 my preferences property        no      Mine innstillinger
+my assigned tickets    property        no      Mine tildelte meldinger
+my submitted tickets   property        no      Mine innmeldte meldinger
 name not entered!      property        no      Navn er ikke angitt
 name of the user, eg. %1       property        no      Navn til bruker, %1
 narrow the search by dates     property        no      Avgrens søket med dato