[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6675] property: remember values from session
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [6675] property: remember values from session |
Date: |
Wed, 15 Dec 2010 13:20:51 +0000 |
Revision: 6675
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6675
Author: sigurdne
Date: 2010-12-15 13:20:51 +0000 (Wed, 15 Dec 2010)
Log Message:
-----------
property: remember values from session
Modified Paths:
--------------
trunk/property/inc/class.borequest.inc.php
trunk/property/inc/class.uirequest.inc.php
trunk/property/js/yahoo/request.index.js
Modified: trunk/property/inc/class.borequest.inc.php
===================================================================
--- trunk/property/inc/class.borequest.inc.php 2010-12-15 13:01:36 UTC (rev
6674)
+++ trunk/property/inc/class.borequest.inc.php 2010-12-15 13:20:51 UTC (rev
6675)
@@ -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: trunk/property/inc/class.uirequest.inc.php
===================================================================
--- trunk/property/inc/class.uirequest.inc.php 2010-12-15 13:01:36 UTC (rev
6674)
+++ trunk/property/inc/class.uirequest.inc.php 2010-12-15 13:20:51 UTC (rev
6675)
@@ -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: trunk/property/js/yahoo/request.index.js
===================================================================
--- trunk/property/js/yahoo/request.index.js 2010-12-15 13:01:36 UTC (rev
6674)
+++ trunk/property/js/yahoo/request.index.js 2010-12-15 13:20:51 UTC (rev
6675)
@@ -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')
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6675] property: remember values from session,
Sigurd Nes <=