[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16363] Stable: Merge 16361:16362 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16363] Stable: Merge 16361:16362 from trunk |
|
Date: |
Tue, 21 Feb 2017 09:56:56 -0500 (EST) |
Revision: 16363
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16363
Author: sigurdne
Date: 2017-02-21 09:56:56 -0500 (Tue, 21 Feb 2017)
Log Message:
-----------
Stable: Merge 16361:16362 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/property/inc/class.bogeneric.inc.php
branches/Version-2_0-branch/property/inc/class.sogeneric.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-02-21 14:55:07 UTC (rev 16362)
+++ branches/Version-2_0-branch 2017-02-21 14:56:56 UTC (rev 16363)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16300
/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
\ 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
\ No newline at end of property
Modified: branches/Version-2_0-branch/property/inc/class.bogeneric.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.bogeneric.inc.php
2017-02-21 14:55:07 UTC (rev 16362)
+++ branches/Version-2_0-branch/property/inc/class.bogeneric.inc.php
2017-02-21 14:56:56 UTC (rev 16363)
@@ -134,7 +134,9 @@
}
$filter = array('list' => ''); // translates to "list
IS NULL"
- $columns =
$this->custom->find($this->location_info['acl_app'],
$this->location_info['acl_location'], 0, '', '', '', true, false, $filter);
+ $system_location =
$this->location_info['system_location'] ?
$this->location_info['system_location'] : $this->location_info['acl_location'];
+
+ $columns =
$this->custom->find($this->location_info['acl_app'], $system_location, 0, '',
'', '', true, false, $filter);
$column_list =
$this->bocommon->select_multi_list($selected, $columns);
return $column_list;
@@ -187,11 +189,12 @@
unset($data['location_info']);
}
$custom_fields = false;
+ $system_location =
$this->location_info['system_location'] ?
$this->location_info['system_location'] : $this->location_info['acl_location'];
if
($GLOBALS['phpgw']->locations->get_attrib_table($this->location_info['acl_app'],
$this->location_info['acl_location']))
{
$custom_fields = true;
$values = array();
- $values['attributes'] =
$this->custom->find($this->location_info['acl_app'],
$this->location_info['acl_location'], 0, '', 'ASC', 'attrib_sort', true, true);
+ $values['attributes'] =
$this->custom->find($this->location_info['acl_app'], $system_location, 0, '',
'ASC', 'attrib_sort', true, true);
}
if (isset($data['id']) && $data['id'])
@@ -200,7 +203,7 @@
}
if ($custom_fields)
{
- $values = $this->custom->prepare($values,
$this->location_info['acl_app'], $this->location_info['acl_location'],
$data['view']);
+ $values = $this->custom->prepare($values,
$this->location_info['acl_app'], $system_location, $data['view']);
}
return $values;
}
@@ -281,7 +284,8 @@
public function read_attrib_history( $data )
{
- $attrib_data = $this->custom->get($data['appname'],
$data['acl_location'], $data['attrib_id'], $inc_choices = true);
+ $system_location = $data['system_location'] ?
$data['system_location'] :$data['acl_location'];
+ $attrib_data = $this->custom->get($data['appname'],
$system_location, $data['attrib_id'], $inc_choices = true);
$historylog = CreateObject('property.historylog',
$data['appname'], $data['acl_location']);
$history_values = $historylog->return_array(array(),
array('SO'), 'history_timestamp', 'DESC', $data['id'], $data['attrib_id']);
@@ -359,8 +363,11 @@
}
}
- $attributes =
$this->custom->find($this->location_info['acl_app'],
$this->location_info['acl_location'], 0, '', 'ASC', 'attrib_sort', true, true);
+ $system_location =
$this->location_info['system_location'] ?
$this->location_info['system_location'] : $this->location_info['acl_location'];
+
+ $attributes =
$this->custom->find($this->location_info['acl_app'], $system_location, 0, '',
'ASC', 'attrib_sort', true, true);
+
$custom_filter = array();
foreach ($attributes as $attribute_id => $attribute)
{
Modified: branches/Version-2_0-branch/property/inc/class.sogeneric.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.sogeneric.inc.php
2017-02-21 14:55:07 UTC (rev 16362)
+++ branches/Version-2_0-branch/property/inc/class.sogeneric.inc.php
2017-02-21 14:56:56 UTC (rev 16363)
@@ -469,6 +469,7 @@
'add_msg' => lang('add'),
'name' => lang('vendor'),
'acl_app' => 'property',
+ 'system_location' => '.vendor',
'acl_location' => '.vendor',
'menu_selection' =>
'property::economy::vendor',
'default' => array
@@ -1996,6 +1997,7 @@
'name' => lang('response
template'),
'acl_app' => 'property',
'acl_location' => '.ticket',
+ 'system_location' =>
'.ticket.response_template',
'menu_selection' =>
'property::helpdesk::response_template',
'default' => array
(
@@ -2459,6 +2461,7 @@
'name' =>
$GLOBALS['phpgw']->translation->translate('office', array(), false, 'booking'),
'acl_app' => 'booking',
'acl_location' => '.office',
+ 'system_location' => '.office',
'menu_selection' =>
'booking::settings::office',
'default' => array
(
@@ -2494,6 +2497,7 @@
'name' =>
$GLOBALS['phpgw']->translation->translate('office user', array(), false,
'booking'),
'acl_app' => 'booking',
'acl_location' =>
'.office.user',
+ 'system_location' =>
'.office.user',
'menu_selection' =>
'booking::settings::office::office_user',
'default' => array
(
Modified: branches/Version-2_0-branch/property/inc/class.uigeneric.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uigeneric.inc.php
2017-02-21 14:55:07 UTC (rev 16362)
+++ branches/Version-2_0-branch/property/inc/class.uigeneric.inc.php
2017-02-21 14:56:56 UTC (rev 16363)
@@ -608,8 +608,10 @@
}
}
- $attributes_groups =
$this->custom->get_attribute_groups($this->location_info['acl_app'],
$this->acl_location, $values['attributes']);
+ $system_location =
$this->location_info['system_location'] ?
$this->location_info['system_location'] : $this->location_info['acl_location'];
+ $attributes_groups =
$this->custom->get_attribute_groups($this->location_info['acl_app'],
$system_location, $values['attributes']);
+
$attributes = array();
foreach ($attributes_groups as $group)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16363] Stable: Merge 16361:16362 from trunk,
sigurdne <=