|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [6564] Property: More on roles |
| Date: | Wed, 10 Nov 2010 08:49:26 +0000 |
Revision: 6564
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6564
Author: sigurdne
Date: 2010-11-10 08:49:25 +0000 (Wed, 10 Nov 2010)
Log Message:
-----------
Property: More on roles
Modified Paths:
--------------
trunk/property/inc/class.uilocation.inc.php
trunk/property/js/yahoo/location.responsiblility_role.js
Modified: trunk/property/inc/class.uilocation.inc.php
===================================================================
--- trunk/property/inc/class.uilocation.inc.php 2010-11-09 22:29:31 UTC (rev
6563)
+++ trunk/property/inc/class.uilocation.inc.php 2010-11-10 08:49:25 UTC (rev
6564)
@@ -868,6 +868,7 @@
+
}
$datatable['pagination']['records_total'] =
$this->bo->total_records;
@@ -1127,11 +1128,6 @@
$default_value = array
('id'=>'','name'=>lang('no part of town'));
array_unshift
($values_combo_box[3],$default_value);
- $values_combo_box[4] =
$this->bocommon->get_user_list_right2('filter',PHPGW_ACL_EDIT,$this->user_id,'.location');
-// array_unshift
($values_combo_box[4],array('id'=>$GLOBALS['phpgw_info']['user']['account_id'],'name'=>lang('mine
roles')));
- $default_value =
array('id'=>'','name'=>lang('no user'));
- array_unshift
($values_combo_box[4],$default_value);
-
/*
$_role_criteria = array
(
@@ -1164,8 +1160,12 @@
'order' => 'name'
);
- $values_combo_box[5] =
execMethod('property.socategory.get_list',$_role_criteria);
+ $values_combo_box[4] =
execMethod('property.socategory.get_list',$_role_criteria);
$default_value = array
('id'=>'','name'=>lang('no role'));
+ array_unshift
($values_combo_box[4],$default_value);
+
+ $values_combo_box[5] =
$this->bocommon->get_user_list_right2('filter',PHPGW_ACL_READ,$this->user_id,".location.{$type_id}");
+ $default_value =
array('id'=>'','name'=>lang('no user'));
array_unshift
($values_combo_box[5],$default_value);
$datatable['actions']['form'] = array(
@@ -1216,20 +1216,22 @@
'style' => 'filter',
'tab_index' => 4
),
- array( //boton
contact
-
'id' => 'btn_user_id',
-
'name' => 'user_id',
-
'value' => lang('user'),
-
'type' => 'button',
-
'style' => 'filter',
-
'tab_index' => 5
- ),
array( //boton
role
'id' => 'btn_role_id',
'name' => 'role_id',
'value' => lang('role'),
'type' => 'button',
'style' => 'filter',
+
'tab_index' => 5
+ ),
+ array( //boton
contact
+
'id' => 'sel_user_id', // testing traditional
listbox for long list
+
'name' => 'user_id',
+
'value' => lang('User'),
+
'type' => 'select',
+
'style' => 'filter',
+
'values' => $values_combo_box[5],
+
'onchange'=> 'onChangeSelect();',
'tab_index' => 6
),
array( // boton SAVE
@@ -1282,10 +1284,6 @@
array( //div values combo_box_4
'id' =>
'values_combo_box_4',
'value' =>
$this->bocommon->select2String($values_combo_box[4]) //i.e. id,value/id,vale/
-
),
-
array( //div values combo_box_5
-
'id' =>
'values_combo_box_5',
-
'value' =>
$this->bocommon->select2String($values_combo_box[5]) //i.e. id,value/id,vale/
)
)
)
Modified: trunk/property/js/yahoo/location.responsiblility_role.js
===================================================================
--- trunk/property/js/yahoo/location.responsiblility_role.js 2010-11-09
22:29:31 UTC (rev 6563)
+++ trunk/property/js/yahoo/location.responsiblility_role.js 2010-11-10
08:49:25 UTC (rev 6564)
@@ -8,8 +8,8 @@
{order:1, var_URL:'cat_id', name:'btn_cat_id',
style:'categorybutton', dependiente:[]},
{order:2, var_URL:'district_id', name:'btn_district_id',
style:'districtbutton', dependiente:[3]},
{order:3,
var_URL:'part_of_town_id',name:'btn_part_of_town_id',style:'partOFTownbutton',dependiente:[]},
- {order:4, var_URL:'user_id', name:'btn_user_id',
style:'userIdbutton', dependiente:[]},
- {order:5, var_URL:'role_id', name:'btn_role_id',
style:'roleIdbutton', dependiente:[]}
+ {order:4, var_URL:'role_id', name:'btn_role_id',
style:'roleIdbutton', dependiente:[]}
+// {order:5, var_URL:'user_id', name:'btn_user_id',
style:'userIdbutton', dependiente:[]}, // dummy - changed to
select
];
// define buttons
| [Prev in Thread] | Current Thread | [Next in Thread] |