[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7058] Merge 7056:7057 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7058] Merge 7056:7057 from trunk |
|
Date: |
Fri, 25 Feb 2011 10:31:48 +0000 |
Revision: 7058
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7058
Author: sigurdne
Date: 2011-02-25 10:31:42 +0000 (Fri, 25 Feb 2011)
Log Message:
-----------
Merge 7056:7057 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
branches/Version-1_0-branch/property/inc/class.uilookup.inc.php
branches/Version-1_0-branch/property/setup/phpgw_no.lang
Added Paths:
-----------
branches/Version-1_0-branch/property/js/yahoo/lookup.b_account.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,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055
+
/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,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057
Modified: branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
2011-02-25 10:27:44 UTC (rev 7057)
+++ branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
2011-02-25 10:31:42 UTC (rev 7058)
@@ -968,7 +968,13 @@
'name' =>
'active',
'descr' =>
lang('active'),
'type' =>
'checkbox',
- 'default' =>
'checked'
+ 'default' =>
'checked',
+ 'filter'
=> true,
+ 'sortable'
=> true,
+ 'values_def'
=> array
+ (
+
'valueset' => array(array('id' => 1, 'name' => lang('active'))),
+ )
),
array
(
Modified: branches/Version-1_0-branch/property/inc/class.uilookup.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uilookup.inc.php
2011-02-25 10:27:44 UTC (rev 7057)
+++ branches/Version-1_0-branch/property/inc/class.uilookup.inc.php
2011-02-25 10:31:42 UTC (rev 7058)
@@ -987,6 +987,93 @@
)
)
);
+
+
+ $values_combo_box = array();
+ $i = 0;
+ $button_def = array();
+ $code_inner = array();
+ if ( $role != 'group' )
+ {
+
$datatable['actions']['form'][0]['fields']['field'][] = array
+ (
+ 'id' => "btn_parent",
+ 'name' => 'parent',
+ 'value' => 'parent',
+ 'type' => 'button',
+ 'style' => 'filter',
+ 'tab_index' => $i
+ );
+
+ $button_def[] = "oMenuButton_{$i}";
+ $code_inner[] = "{order:{$i},
var_URL:'parent',name:'btn_parent',style:'genericbutton',dependiente:[]}";
+
+ $values_combo_box[] =
execMethod('property.bogeneric.get_list',array('type' => 'b_account','selected'
=> $parent,'filter' => array('active' =>1)));
+ $default_value = array
('id'=>'','name'=> lang('select'));
+ array_unshift
($values_combo_box[$i],$default_value);
+ }
+
+ if($button_def)
+ {
+ $code = 'var ' . implode(',',
$button_def) . ";\n";
+ $code .= 'var selectsButtons = [' .
"\n" . implode(",\n",$code_inner) . "\n];";
+ $code .= <<<JS
+ this.particular_setting =
function()
+ {
+
if(flag_particular_setting=='init')
+ {
+ //parent
+ index =
locate_in_array_options(0,"value",path_values.parent);
+ if(index)
+ {
+
oMenuButton_0.set("label", ("<em>" + array_options[0][index][1] + "</em>"));
+ }
+
+ //--focus for
txt_query---
+
YAHOO.util.Dom.get(textImput[0].id).focus();
+ }
+ else
if(flag_particular_setting=='update')
+ {
+ // nothing
+ }
+ }
+JS;
+
+ }
+ else
+ {
+ $code = 'var selectsButtons = [];';
+ $code .= <<<JS
+ this.particular_setting =
function()
+ {
+
if(flag_particular_setting=='init')
+ {
+ //--focus for
txt_query---
+
YAHOO.util.Dom.get(textImput[0].id).focus();
+ }
+ else
if(flag_particular_setting=='update')
+ {
+ // nothing
+ }
+ }
+JS;
+ }
+
+ $GLOBALS['phpgw']->js->add_code('', $code);
+
+ if($values_combo_box)
+ {
+ $i = 0;
+ foreach ( $values_combo_box as $combo )
+ {
+
$datatable['actions']['form'][0]['fields']['hidden_value'][] = array
+ (
+ 'id' =>
"values_combo_box_{$i}",
+ 'value' =>
execMethod('property.bocommon.select2String',$combo)
+ );
+ $i++;
+ }
+ }
}
$uicols = array (
@@ -1128,7 +1215,7 @@
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
// Prepare YUI Library
- $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'lookup.tenant.index', 'property' );
+ $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'lookup.b_account.index', 'property' );
$this->save_sessiondata();
}
Copied: branches/Version-1_0-branch/property/js/yahoo/lookup.b_account.index.js
(from rev 7057, trunk/property/js/yahoo/lookup.b_account.index.js)
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/lookup.b_account.index.js
(rev 0)
+++ branches/Version-1_0-branch/property/js/yahoo/lookup.b_account.index.js
2011-02-25 10:31:42 UTC (rev 7058)
@@ -0,0 +1,37 @@
+//--------------------------------------------------------
+// Declaration of lookup.b_account.index vars
+//--------------------------------------------------------
+
+ // define buttons
+ var oNormalButton_0;
+ var normalButtons = [
+ {order:0, name:'btn_search', funct:"onSearchClick"}
+ ]
+
+ // define Text buttons
+ var textImput = [
+ {order:0, name:'query', id:'txt_query'}
+ ]
+
+ // define the hidden column in datatable
+ var config_values = {
+ date_search : 0 //if search has link "Data search"
+ }
+/****************************************************************************************/
+
+ YAHOO.util.Event.addListener(window, "load", function()
+ {
+
YAHOO.util.Dom.getElementsByClassName('toolbar','div')[0].style.display =
'none';
+ var loader = new YAHOO.util.YUILoader();
+ loader.addModule({
+ name: "anyone", //module name; must be unique
+ type: "js", //can be "js" or "css"
+ fullpath: property_js //'property_js' have the path for
property.js, is render in HTML
+ });
+
+ loader.require("anyone");
+
+ //Insert JSON utility on the page
+
+ loader.insert();
+ });
Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang 2011-02-25
10:27:44 UTC (rev 7057)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang 2011-02-25
10:31:42 UTC (rev 7058)
@@ -1,10 +1,10 @@
-%1 buildings has been updated to not active of %2 already not active
property no %1 Bygninger er oppdatert til IKKE AKTIVE av %2 som var
IKKE ACTIVE fra før
-%1 entrances has been updated to not active of %2 already not active
property no %1 Innganger er oppdatert til IKKE AKTIVE av %2 som var
IKKE ACTIVE fra før
+%1 buildings has been updated to not active of %2 already not active
property no %1 Bygninger er oppdatert til IKKE AKTIVE av %2 som var
IKKE AKTIVE fra før
+%1 entrances has been updated to not active of %2 already not active
property no %1 Innganger er oppdatert til IKKE AKTIVE av %2 som var
IKKE AKTIVE fra før
%1 entries is added! property no %1 poster er lagt til
%1 entries is updated! property no %1 poster er oppdatert
%1 group property no %1 gruppe
%1 is notified property no Melding sendt til %1
-%1 properties has been updated to not active of %2 already not active
property no %1 Eiendommer er oppdatert til IKKE AKTIVE av %2 som
var IKKE ACTIVE fra før
+%1 properties has been updated to not active of %2 already not active
property no %1 Eiendommer er oppdatert til IKKE AKTIVE av %2 som
var IKKE AKTIVE fra før
about common no Om
access error property no Manglende tilgang
accounting property no Regnskap
@@ -18,6 +18,7 @@
acquisition date property no Anskaffelses dato
action property no Handling
acivate tracking of dates in helpdesk main list property no
Aktiver visning av datoer for denne entiteten i hovedliste for helpdesk
+active property no Aktiv
activities property no Aktiviteter
activity property no Aktivitet
activity code property no Aktivitets kode
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7058] Merge 7056:7057 from trunk,
Sigurd Nes <=