[Fmsystem-commits] [6676] merge 6674:6675 from trunk

[Sigurd Nes]

Revision: 6676
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6676
Author:   sigurdne
Date:     2010-12-15 13:21:52 +0000 (Wed, 15 Dec 2010)
Log Message:
-----------
merge 6674:6675 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/property/inc/class.borequest.inc.php
    branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
    branches/Version-1_0-branch/property/js/yahoo/request.index.js

Property Changed:
----------------
    branches/Version-1_0-branch/


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675

Modified: branches/Version-1_0-branch/property/inc/class.borequest.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.borequest.inc.php    
2010-12-15 13:20:51 UTC (rev 6675)
+++ branches/Version-1_0-branch/property/inc/class.borequest.inc.php    
2010-12-15 13:21:52 UTC (rev 6676)
@@ -103,7 +103,7 @@
                        }
                        if(isset($_POST['status_id']) || 
isset($_GET['status_id']))
                        {
-                               $this->status_id = $district_id;
+                               $this->status_id = $status_id;
                        }
                        if(isset($_POST['criteria_id']) || 
isset($_GET['criteria_id']))
                        {

Modified: branches/Version-1_0-branch/property/inc/class.uirequest.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uirequest.inc.php    
2010-12-15 13:20:51 UTC (rev 6675)
+++ branches/Version-1_0-branch/property/inc/class.uirequest.inc.php    
2010-12-15 13:21:52 UTC (rev 6676)
@@ -174,10 +174,10 @@
                                                                                
."p_num: '{$this->p_num}',"
                                                                                
                ."query:'{$this->query}',"
                                                                                
."lookup:'{$lookup}',"
-                                                                               
                        ."project_id:'{$project_id}'";
-                                                       //                      
  ."filter:'{$this->filter}',"
-                                                       //                      
  ."status_id:'{$this->status_id}',"
-                                                       //                      
  ."cat_id:'{$this->cat_id}'";
+                                                                               
                        ."project_id:'{$project_id}',"
+                                                                               
."filter:'{$this->filter}',"
+                                                                               
."status_id:'{$this->status_id}',"
+                                                                               
."cat_id:'{$this->cat_id}'";
 
                                $values_combo_box[0] = 
$this->cats->formatted_xslt_list(array('select_name' => 'cat_id','selected' => 
$this->cat_id,'globals' => True));
                                $default_value = array ('cat_id'=>'','name'=> 
lang('no category'));
@@ -188,6 +188,7 @@
                                array_unshift 
($values_combo_box[1],$default_value);
 
                                $values_combo_box[2]  = 
$this->bocommon->get_user_list('filter',$this->filter,$extra=false,$default=false,$start=-1,$sort='ASC',$order='account_lastname',$query='',$offset=-1);
+                               array_unshift 
($values_combo_box[2],array('user_id'=>$GLOBALS['phpgw_info']['user']['account_id'],'name'=>$GLOBALS['phpgw_info']['user']['fullname']));
                                $default_value = array 
('user_id'=>'','name'=>lang('no user'));
                                array_unshift 
($values_combo_box[2],$default_value);
 

Modified: branches/Version-1_0-branch/property/js/yahoo/request.index.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/request.index.js      
2010-12-15 13:20:51 UTC (rev 6675)
+++ branches/Version-1_0-branch/property/js/yahoo/request.index.js      
2010-12-15 13:21:52 UTC (rev 6676)
@@ -43,6 +43,26 @@
        {
                if(flag_particular_setting=='init')
                {
+//     console.log(path_values);
+                       //category
+                       index = 
locate_in_array_options(0,"value",path_values.cat_id);
+                       if(index)
+                       {
+                               oMenuButton_0.set("label", ("<em>" + 
array_options[0][index][1] + "</em>"));
+                       }
+                       //status
+                       index = 
locate_in_array_options(1,"value",path_values.status_id);
+                       if(index)
+                       {
+                               oMenuButton_1.set("label", ("<em>" + 
array_options[1][index][1] + "</em>"));
+                       }
+                       //user
+                       index = 
locate_in_array_options(2,"value",path_values.filter);
+                       if(index)
+                       {
+                               oMenuButton_2.set("label", ("<em>" + 
array_options[2][index][1] + "</em>"));
+                       }
+
                        oMenuButton_0.focus();
                }
                else if(flag_particular_setting=='update')