[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16225] Stable: Merge 16222:16224 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16225] Stable: Merge 16222:16224 from trunk |
|
Date: |
Wed, 1 Feb 2017 09:59:20 -0500 (EST) |
Revision: 16225
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16225
Author: sigurdne
Date: 2017-02-01 09:59:20 -0500 (Wed, 01 Feb 2017)
Log Message:
-----------
Stable: Merge 16222:16224 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/property/inc/class.botts.inc.php
branches/Version-2_0-branch/property/inc/class.uitts.inc.php
branches/Version-2_0-branch/property/setup/phpgw_no.lang
branches/Version-2_0-branch/property/templates/base/config.tpl
branches/Version-2_0-branch/rental/setup/default_records.inc.php
branches/Version-2_0-branch/rental/setup/tables_update.inc.php
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-02-01 14:57:51 UTC (rev 16224)
+++ branches/Version-2_0-branch 2017-02-01 14:59:20 UTC (rev 16225)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16188
/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
\ 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
\ No newline at end of property
Modified: branches/Version-2_0-branch/property/inc/class.botts.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.botts.inc.php
2017-02-01 14:57:51 UTC (rev 16224)
+++ branches/Version-2_0-branch/property/inc/class.botts.inc.php
2017-02-01 14:59:20 UTC (rev 16225)
@@ -87,6 +87,16 @@
$this->config->read();
+ $default_interface =
isset($this->config->config_data['tts_default_interface']) ?
$this->config->config_data['tts_default_interface'] : '';
+
+ /*
+ * Inverted logic
+ */
+ if($default_interface == 'simplified')
+ {
+ $this->simple = true;
+ }
+
$user_groups =
$GLOBALS['phpgw']->accounts->membership($this->account);
$simple_group =
isset($this->config->config_data['fmttssimple_group']) ?
$this->config->config_data['fmttssimple_group'] : array();
@@ -111,12 +121,18 @@
reset($user_groups);
$user_groups =
$GLOBALS['phpgw']->accounts->membership($this->account);
- $simple_group =
isset($this->config->config_data['fmttssimple_group']) ?
$this->config->config_data['fmttssimple_group'] : array();
foreach ($user_groups as $group => $dummy)
{
if (in_array($group, $simple_group))
{
- $this->simple = true;
+ if($default_interface == 'simplified')
+ {
+ $this->simple = false;
+ }
+ else
+ {
+ $this->simple = true;
+ }
break;
}
}
Modified: branches/Version-2_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uitts.inc.php
2017-02-01 14:57:51 UTC (rev 16224)
+++ branches/Version-2_0-branch/property/inc/class.uitts.inc.php
2017-02-01 14:59:20 UTC (rev 16225)
@@ -1077,20 +1077,24 @@
'parameters' => json_encode($parameters)
);
}
- $data['datatable']['actions'][] = array
- (
- 'my_name' => 'docs',
- 'statustext' => lang('documents'),
- 'text' => lang('documents'),
- 'action' =>
$GLOBALS['phpgw']->link('/index.php', array
+
+ if(!$this->simple)
+ {
+ $data['datatable']['actions'][] = array
(
- 'menuaction' =>
'property.uidocument.list_doc',
- )),
- 'target' => '_blank',
- 'parameters' =>
json_encode($parameters_location)
- );
+ 'my_name' => 'docs',
+ 'statustext' => lang('documents'),
+ 'text' => lang('documents'),
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php', array
+ (
+ 'menuaction' =>
'property.uidocument.list_doc',
+ )),
+ 'target' => '_blank',
+ 'parameters' =>
json_encode($parameters_location)
+ );
+ }
- if
(isset($GLOBALS['phpgw_info']['user']['preferences']['property']['tts_status_link'])
&&
$GLOBALS['phpgw_info']['user']['preferences']['property']['tts_status_link'] ==
'yes' && $this->acl_edit)
+ if (!$this->simple &&
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['tts_status_link'])
&&
$GLOBALS['phpgw_info']['user']['preferences']['property']['tts_status_link'] ==
'yes' && $this->acl_edit)
{
$status['X'] = array
(
Modified: branches/Version-2_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/property/setup/phpgw_no.lang 2017-02-01
14:57:51 UTC (rev 16224)
+++ branches/Version-2_0-branch/property/setup/phpgw_no.lang 2017-02-01
14:59:20 UTC (rev 16225)
@@ -2073,4 +2073,5 @@
request for approval property no Anmodning om godkjenning
approval from %1 is required for order %2 property no
Godkjenning fra %1 er påkrevd for ordre %2
missing recipient for order %1 property no Mangler mottaker for
ordre %1
-export property no Eksport
\ No newline at end of file
+export property no Eksport
+simplified property no Forenklet
\ No newline at end of file
Modified: branches/Version-2_0-branch/property/templates/base/config.tpl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/config.tpl
2017-02-01 14:57:51 UTC (rev 16224)
+++ branches/Version-2_0-branch/property/templates/base/config.tpl
2017-02-01 14:59:20 UTC (rev 16225)
@@ -342,6 +342,15 @@
</td>
</tr>
<tr>
+ <td >{lang_TTS_default_interface}:</td>
+ <td>
+ <select
name="newsettings[tts_default_interface]">
+ <option value=""
{selected_tts_default_interface_}>Full</option>
+ <option value="simplified"
{selected_tts_default_interface_simplified}>{lang_simplified}</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
<td valign =
'top'>{lang_TTS_simplified_group}:</td>
<td>
<!--to be able to blank the setting -
need an empty value-->
Modified: branches/Version-2_0-branch/rental/setup/default_records.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/setup/default_records.inc.php
2017-02-01 14:57:51 UTC (rev 16224)
+++ branches/Version-2_0-branch/rental/setup/default_records.inc.php
2017-02-01 14:59:20 UTC (rev 16225)
@@ -35,6 +35,9 @@
$GLOBALS['phpgw']->locations->add('.', 'Root', 'rental', false);
$GLOBALS['phpgw']->locations->add('.contract', 'Contract', 'rental',
$allow_grant = false, $custom_tbl = false, $c_function = true);
$GLOBALS['phpgw']->locations->add('.application', 'Application',
'rental', $allow_grant = false, $custom_tbl = false, $c_function = true);
+ $GLOBALS['phpgw']->locations->add('.moveout', 'Moveout', 'rental',
$allow_grant = true, $custom_tbl = 'rental_moveout', $c_function = true,
$c_attrib = true);
+ $GLOBALS['phpgw']->locations->add('.movein', 'Movein', 'rental',
$allow_grant = true, $custom_tbl = 'rental_movein', $c_function = true,
$c_attrib = true);
+
$GLOBALS['phpgw']->locations->add('.ORG', 'Locations for organisational
units', 'rental', false);
$GLOBALS['phpgw']->locations->add('.ORG.BK', 'Organisational units in
Bergen Kommune', 'rental', false);
Modified: branches/Version-2_0-branch/rental/setup/tables_update.inc.php
===================================================================
--- branches/Version-2_0-branch/rental/setup/tables_update.inc.php
2017-02-01 14:57:51 UTC (rev 16224)
+++ branches/Version-2_0-branch/rental/setup/tables_update.inc.php
2017-02-01 14:59:20 UTC (rev 16225)
@@ -746,7 +746,7 @@
{
$GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
- $GLOBALS['phpgw']->locations->add('.moveout', 'Movein',
'rental', $allow_grant = true, $custom_tbl = 'rental_moveout', $c_function =
true, $c_attrib = true);
+ $GLOBALS['phpgw']->locations->add('.moveout', 'Moveout',
'rental', $allow_grant = true, $custom_tbl = 'rental_moveout', $c_function =
true, $c_attrib = true);
$GLOBALS['phpgw_setup']->oProc->CreateTable(
'rental_moveout', array(
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16225] Stable: Merge 16222:16224 from trunk,
sigurdne <=