[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16681] Stable: Merge 16678:16680 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16681] Stable: Merge 16678:16680 from trunk |
|
Date: |
Wed, 3 May 2017 09:31:20 -0400 (EDT) |
Revision: 16681
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16681
Author: sigurdne
Date: 2017-05-03 09:31:20 -0400 (Wed, 03 May 2017)
Log Message:
-----------
Stable: Merge 16678:16680 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/property/inc/class.bolocation.inc.php
branches/Version-2_0-branch/property/inc/class.custom_fields.inc.php
branches/Version-2_0-branch/property/inc/class.uigeneric.inc.php
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-05-03 13:29:52 UTC (rev 16680)
+++ branches/Version-2_0-branch 2017-05-03 13:31:20 UTC (rev 16681)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16587
/branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680
\ No newline at end of property
Modified: branches/Version-2_0-branch/property/inc/class.bolocation.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.bolocation.inc.php
2017-05-03 13:29:52 UTC (rev 16680)
+++ branches/Version-2_0-branch/property/inc/class.bolocation.inc.php
2017-05-03 13:31:20 UTC (rev 16681)
@@ -512,8 +512,8 @@
$location['location'][$i]['name'] = lang('Contact phone');
$location['location'][$i]['input_name'] = 'contact_phone';
$input_name[] =
$location['location'][$i]['input_name'];
-
$location['location'][$i]['size'] = 12;
-
$location['location'][$i]['class'] = 'pure-u-1-2';
+
$location['location'][$i]['size'] = 30;
+
$location['location'][$i]['class'] = 'pure-u-1';
$location['location'][$i]['lookup_function_call'] =
'';//$lookup_functions[$m]['name'];
$insert_record['extra']['contact_phone'] = 'contact_phone';
$location['location'][$i]['value'] = (isset($data['values']['contact_phone']) ?
$data['values']['contact_phone'] : '');
Modified: branches/Version-2_0-branch/property/inc/class.custom_fields.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.custom_fields.inc.php
2017-05-03 13:29:52 UTC (rev 16680)
+++ branches/Version-2_0-branch/property/inc/class.custom_fields.inc.php
2017-05-03 13:31:20 UTC (rev 16681)
@@ -56,7 +56,7 @@
/**
* Prepare custom attributes for ui
- *
+ *
* @param array $values values and definitions of custom
attributes
* @param ???? $appname ????
* @param ???? $location ????
@@ -64,7 +64,7 @@
*
* @return array values and definitions of custom attributes
prepared for ui
*/
- public function prepare( $values, $appname, $location,
$view_only = '' )
+ public function prepare( $values, $appname, $location,
$view_only = false )
{
$cache_custom_lookup = array();
@@ -108,7 +108,7 @@
}
- if ($attributes['datatype'] == 'D')
+ if ($attributes['datatype'] == 'D' &&
!$view_only)
{
$clear_functions[$m]['name'] =
"clear_{$attributes['name']}()";
$confirm_msg = lang('delete') .
'?';
@@ -121,7 +121,7 @@
JS;
$m++;
}
- else if ($attributes['datatype'] ==
'DT')
+ else if ($attributes['datatype'] ==
'DT' && !$view_only)
{
$clear_functions[$m]['name'] =
"clear_{$attributes['name']}()";
$confirm_msg = lang('delete') .
'?';
@@ -168,23 +168,26 @@
}
$insert_record_values[] =
$attributes['name'];
- $lookup_link =
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uilookup.addressbook',
- 'column' => $attributes['name'],
- 'clear_state'=> 1));
+ if(!$view_only)
+ {
+ $lookup_link =
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uilookup.addressbook',
+ 'column' =>
$attributes['name'],
+ 'clear_state'=> 1));
- $lookup_functions[$m]['name'] =
'lookup_' . $attributes['name'] . '()';
- $lookup_functions[$m]['action'] =
'TINY.box.show({iframe:"' . $lookup_link . '",
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});';
+ $lookup_functions[$m]['name'] =
'lookup_' . $attributes['name'] . '()';
+ $lookup_functions[$m]['action']
= 'TINY.box.show({iframe:"' . $lookup_link . '",
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});';
- $clear_functions[$m]['name'] =
"clear_{$attributes['name']}()";
- $confirm_msg = lang('delete') . '?';
- $clear_functions[$m]['action'] = <<<JS
- if(confirm("{$confirm_msg}"))
- {
-
parent.getElementsByName('{$attributes['name']}')[0].value = '';
-
parent.getElementsByName('{$attributes['name']}_name')[0].value = '';
+ $clear_functions[$m]['name'] =
"clear_{$attributes['name']}()";
+ $confirm_msg = lang('delete') .
'?';
+ $clear_functions[$m]['action']
= <<<JS
+ if(confirm("{$confirm_msg}"))
+ {
+
parent.getElementsByName('{$attributes['name']}')[0].value = '';
+
parent.getElementsByName('{$attributes['name']}_name')[0].value = '';
+ }
+JS;
+ $m++;
}
-JS;
- $m++;
}
else if ($attributes['datatype'] == 'ABO')
{
@@ -212,12 +215,15 @@
}
$insert_record_values[] =
$attributes['name'];
- $lookup_link =
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uilookup.organisation',
- 'column' =>
$attributes['name']));
+ if(!$view_only)
+ {
+ $lookup_link =
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uilookup.organisation',
+ 'column' =>
$attributes['name']));
- $lookup_functions[$m]['name'] =
'lookup_' . $attributes['name'] . '()';
- $lookup_functions[$m]['action'] =
'TINY.box.show({iframe:"' . $lookup_link . '",
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});';
- $m++;
+ $lookup_functions[$m]['name'] =
'lookup_' . $attributes['name'] . '()';
+ $lookup_functions[$m]['action']
= 'TINY.box.show({iframe:"' . $lookup_link . '",
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});';
+ $m++;
+ }
}
else if ($attributes['datatype'] == 'VENDOR')
{
@@ -237,12 +243,15 @@
}
$insert_record_values[] =
$attributes['name'];
- $lookup_link =
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uilookup.vendor',
- 'column' =>
$attributes['name']));
+ if(!$view_only)
+ {
+ $lookup_link =
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uilookup.vendor',
+ 'column' =>
$attributes['name']));
- $lookup_functions[$m]['name'] =
'lookup_' . $attributes['name'] . '()';
- $lookup_functions[$m]['action'] =
'TINY.box.show({iframe:"' . $lookup_link . '",
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});';
- $m++;
+ $lookup_functions[$m]['name'] =
'lookup_' . $attributes['name'] . '()';
+ $lookup_functions[$m]['action']
= 'TINY.box.show({iframe:"' . $lookup_link . '",
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});';
+ $m++;
+ }
}
else if ($attributes['datatype'] == 'custom1')
// select
{
@@ -279,16 +288,19 @@
}
$insert_record_values[] =
$attributes['name'];
- $lookup_link =
$GLOBALS['phpgw']->link('/index.php', array(
- 'menuaction' =>
'property.uilookup.custom',
- 'column' => $attributes['name'],
- 'get_list_function' =>
$attributes['get_list_function'],
- 'get_list_function_input' =>
urlencode(serialize($attributes['get_list_function_input']))
- ));
+ if(!$view_only)
+ {
+ $lookup_link =
$GLOBALS['phpgw']->link('/index.php', array(
+ 'menuaction' =>
'property.uilookup.custom',
+ 'column' =>
$attributes['name'],
+ 'get_list_function' =>
$attributes['get_list_function'],
+
'get_list_function_input' =>
urlencode(serialize($attributes['get_list_function_input']))
+ ));
- $lookup_functions[$m]['name'] =
'lookup_' . $attributes['name'] . '()';
- $lookup_functions[$m]['action'] =
'TINY.box.show({iframe:"' . $lookup_link . '",
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});';
- $m++;
+ $lookup_functions[$m]['name'] =
'lookup_' . $attributes['name'] . '()';
+ $lookup_functions[$m]['action']
= 'TINY.box.show({iframe:"' . $lookup_link . '",
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});';
+ $m++;
+ }
}
else if ($attributes['datatype'] == 'custom3')
//autocomplete
{
@@ -307,23 +319,23 @@
$insert_record_values[] =
$attributes['name'];
- $_append_url = '';
- if
(isset($attributes['get_list_function_input']) &&
is_array($attributes['get_list_function_input']))
+ if (!$view_only)
{
- $_append_url = '&' .
http_build_query($attributes['get_list_function_input']);
- }
+ $_append_url = '';
+ if
(isset($attributes['get_list_function_input']) &&
is_array($attributes['get_list_function_input']))
+ {
+ $_append_url = '&' .
http_build_query($attributes['get_list_function_input']);
+ }
+ $_autocomplete = <<<JS
- $_autocomplete = <<<JS
+ var oArgs =
{menuaction:'{$attributes['get_list_function']}'};
+ var strURL =
phpGWLink('index.php', oArgs, true);
+ strURL +=
'{$_append_url}';
- var oArgs =
{menuaction:'{$attributes['get_list_function']}'};
- var strURL =
phpGWLink('index.php', oArgs, true);
- strURL += '{$_append_url}';
+
JqueryPortico.autocompleteHelper(strURL, '{$attributes['name']}_name',
'{$attributes['name']}_id', '{$attributes['name']}_container');
-
JqueryPortico.autocompleteHelper(strURL, '{$attributes['name']}_name',
'{$attributes['name']}_id', '{$attributes['name']}_container');
+JS;
-JS;
- if (!$view_only)
- {
$GLOBALS['phpgw']->js->add_code('', $_autocomplete);
}
}
@@ -336,12 +348,15 @@
}
$insert_record_values[] =
$attributes['name'];
- $lookup_link =
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uilookup.phpgw_user',
- 'column' =>
$attributes['name'],'clear_state'=> 1));
+ if (!$view_only)
+ {
+ $lookup_link =
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uilookup.phpgw_user',
+ 'column' =>
$attributes['name'],'clear_state'=> 1));
- $lookup_functions[$m]['name'] =
'lookup_' . $attributes['name'] . '()';
- $lookup_functions[$m]['action'] =
'TINY.box.show({iframe:"' . $lookup_link . '",
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});';
- $m++;
+ $lookup_functions[$m]['name'] =
'lookup_' . $attributes['name'] . '()';
+ $lookup_functions[$m]['action']
= 'TINY.box.show({iframe:"' . $lookup_link . '",
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});';
+ $m++;
+ }
}
else if ($attributes['datatype'] == 'R' ||
$attributes['datatype'] == 'CH' || $attributes['datatype'] == 'LB')
{
@@ -416,22 +431,24 @@
}
$insert_record_values[] =
$attributes['name'];
+ if (!$view_only)
+ {
+ $lookup_functions[$m]['name'] =
'lookup_' . $attributes['name'] . '()';
- $lookup_functions[$m]['name'] =
'lookup_' . $attributes['name'] . '()';
-
- $lookup_functions[$m]['action'] = "var
oArgs = {menuaction:'{$this->_appname}.uievent.edit',lookup:1,"
- . "location:'{$location}',"
- .
"attrib_id:'{$attributes['id']}'";
- $lookup_functions[$m]['action'] .=
isset($attributes['item_id']) && $attributes['item_id'] ?
",item_id:{$attributes['item_id']}" : '';
- $lookup_functions[$m]['action'] .=
isset($attributes['value']) && $attributes['value'] ?
",id:{$attributes['value']}" : '';
- $lookup_functions[$m]['action'] .=
"};\n";
- $lookup_functions[$m]['action'] .=
"if(document.form.{$attributes['name']}.value)\n";
- $lookup_functions[$m]['action'] .=
"{\n";
- $lookup_functions[$m]['action'] .=
"oArgs['id'] = document.form.{$attributes['name']}.value;";
- $lookup_functions[$m]['action'] .=
"}\n";
- $lookup_functions[$m]['action'] .= "var
strURL = phpGWLink('index.php', oArgs);\n";
- $lookup_functions[$m]['action'] .=
'TINY.box.show({iframe:strURL,
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});';
- $m++;
+ $lookup_functions[$m]['action']
= "var oArgs = {menuaction:'{$this->_appname}.uievent.edit',lookup:1,"
+ .
"location:'{$location}',"
+ .
"attrib_id:'{$attributes['id']}'";
+ $lookup_functions[$m]['action']
.= isset($attributes['item_id']) && $attributes['item_id'] ?
",item_id:{$attributes['item_id']}" : '';
+ $lookup_functions[$m]['action']
.= isset($attributes['value']) && $attributes['value'] ?
",id:{$attributes['value']}" : '';
+ $lookup_functions[$m]['action']
.= "};\n";
+ $lookup_functions[$m]['action']
.= "if(document.form.{$attributes['name']}.value)\n";
+ $lookup_functions[$m]['action']
.= "{\n";
+ $lookup_functions[$m]['action']
.= "oArgs['id'] = document.form.{$attributes['name']}.value;";
+ $lookup_functions[$m]['action']
.= "}\n";
+ $lookup_functions[$m]['action']
.= "var strURL = phpGWLink('index.php', oArgs);\n";
+ $lookup_functions[$m]['action']
.= 'TINY.box.show({iframe:strURL,
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});';
+ $m++;
+ }
}
else if (isset($entity['attributes'][$i]) &&
$entity['attributes'][$i]['datatype'] != 'I' &&
$entity['attributes'][$i]['value'])
{
@@ -824,7 +841,7 @@
}
/**
- *
+ *
* @param integer $location_id
* @param string $entity_table
* @param string $criteria_id - if specified to datatypes
Modified: branches/Version-2_0-branch/property/inc/class.uigeneric.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uigeneric.inc.php
2017-05-03 13:29:52 UTC (rev 16680)
+++ branches/Version-2_0-branch/property/inc/class.uigeneric.inc.php
2017-05-03 13:31:20 UTC (rev 16681)
@@ -183,7 +183,7 @@
}
}
}
-
+/*
$insert_record_attributes =
$GLOBALS['phpgw']->session->appsession("insert_record_values{$this->acl_location}",
$this->location_info['acl_app']);
if (is_array($insert_record_attributes))
@@ -199,7 +199,7 @@
}
}
}
-
+*/
/*
* Extra data from custom fields
*/
@@ -977,12 +977,12 @@
if ($id)
{
- $data = $this->bo->read_single(array('id' =>
$id));
+ $data = $this->bo->read_single(array('id' =>
$id,'view' => true));
$action = 'edit';
}
else
{
- $data = $this->bo->read_single();
+ $data = $this->bo->read_single(array('view' =>
true));
$action = 'add';
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16681] Stable: Merge 16678:16680 from trunk,
sigurdne <=