[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16286] Stable: Merge 16284:16285 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16286] Stable: Merge 16284:16285 from trunk |
|
Date: |
Wed, 8 Feb 2017 14:00:52 -0500 (EST) |
Revision: 16286
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16286
Author: sigurdne
Date: 2017-02-08 14:00:51 -0500 (Wed, 08 Feb 2017)
Log Message:
-----------
Stable: Merge 16284:16285 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
branches/Version-2_0-branch/helpdesk/templates/base/config.tpl
branches/Version-2_0-branch/property/inc/class.botts.inc.php
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-02-08 19:00:00 UTC (rev 16285)
+++ branches/Version-2_0-branch 2017-02-08 19:00:51 UTC (rev 16286)
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,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
\ 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
\ No newline at end of property
Modified: branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
===================================================================
--- branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
2017-02-08 19:00:00 UTC (rev 16285)
+++ branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
2017-02-08 19:00:51 UTC (rev 16286)
@@ -106,8 +106,35 @@
$this->end_date =
$this->bo->end_date;
$this->location_code =
$this->bo->location_code;
$this->p_num =
$this->bo->p_num;
+
+
+ $default_interface =
isset($this->bo->config->config_data['tts_default_interface']) ?
$this->bo->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->bo->config->config_data['fmttssimple_group']) ?
$this->bo->config->config_data['fmttssimple_group'] : array();
+ foreach ($user_groups as $group => $dummy)
+ {
+ if (in_array($group, $simple_group))
+ {
+ if($default_interface == 'simplified')
+ {
+ $this->_simple = false;
+ }
+ else
+ {
+ $this->_simple = true;
+ }
+ break;
+ }
+ }
if
(isset($this->bo->config->config_data['fmtts_assign_group_candidates']) &&
is_array($this->bo->config->config_data['fmtts_assign_group_candidates']))
{
foreach
($this->bo->config->config_data['fmtts_assign_group_candidates'] as
$group_candidate)
@@ -118,11 +145,14 @@
}
}
}
+
+ reset($user_groups);
+
foreach ( $user_groups as $group => $dummy)
{
- if ( in_array($group, $simple_group) &&
!in_array($group, $this->_group_candidates))
+ if ( in_array($group, $this->_group_candidates))
{
- $this->_simple = true;
+ $this->_simple = false;
break;
}
}
Modified: branches/Version-2_0-branch/helpdesk/templates/base/config.tpl
===================================================================
--- branches/Version-2_0-branch/helpdesk/templates/base/config.tpl
2017-02-08 19:00:00 UTC (rev 16285)
+++ branches/Version-2_0-branch/helpdesk/templates/base/config.tpl
2017-02-08 19:00:51 UTC (rev 16286)
@@ -1,18 +1,20 @@
<!-- BEGIN header -->
<form method="POST" action="{action_url}">
- <table class="pure-table pure-table-bordered">
- <tr class="th">
- <td colspan="2"><font
color="{th_text}"> <b>{title}</b></font></td>
- </tr>
+ <table class="pure-table pure-table-bordered pure-table-striped">
+ <thead>
+ <tr>
+ <th colspan="2">{title}</th>
+ </tr>
+ </thead>
<!-- END header -->
<!-- BEGIN body -->
- <tr class="row_on">
+ <tr>
<td colspan="2"> </td>
</tr>
<tr class="row_off">
<td
colspan="2"> <b>{lang_helpdesk}/{lang_settings}</b></td>
</tr>
- <tr class="row_on">
+ <tr>
<td>{lang_app_name}: <br>
{lang_default}: {lang_Helpdesk}</td>
<td><input name="newsettings[app_name]"
value="{value_app_name}"></td>
@@ -29,7 +31,7 @@
<tr class="row_off">
<td
colspan="2"> <b>{lang_TTS}::{lang_settings}</b></td>
</tr>
- <tr class="row_on">
+ <tr>
<td>{lang_Open_translates_to}: <br>
{lang_default}: {lang_Open}</td>
<td><input name="newsettings[tts_lang_open]"
value="{value_tts_lang_open}"></td>
@@ -61,8 +63,17 @@
</select>
</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 class="row_on">
+ <tr>
<td valign = 'top'>{lang_TTS_simplified_group}:</td>
<td>
<!--to be able to blank the setting - need an
empty value-->
@@ -82,7 +93,7 @@
</table>
</td>
</tr>
- <tr class="row_on">
+ <tr>
<td>{lang_Mail_Notification}:</td>
<td>
<select name="newsettings[mailnotification]">
@@ -109,7 +120,7 @@
</select>
</td>
</tr>
- <tr class="row_on">
+ <tr>
<td>{lang_Assigned_Notification_TTS}.</td>
<td>
<select
name="newsettings[assignednotification]">
@@ -136,7 +147,7 @@
</select>
</td>
</tr>
- <tr class="row_on">
+ <tr>
<td>{lang_priority_levels_TTS}.</td>
<td>
<select name="newsettings[prioritylevels]">
@@ -156,7 +167,7 @@
</td>
</tr>
- <tr class="row_on">
+ <tr>
<td valign = 'top'>{lang_TTS_finnish_date}:</td>
<td>
<!--to be able to blank the setting - need an
empty value-->
@@ -178,17 +189,19 @@
<!-- END body -->
<!-- BEGIN footer -->
- <tr class="th">
- <td colspan="2">
-
- </td>
- </tr>
- <tr>
- <td colspan="2" align="center">
- <input type="submit" name="submit"
value="{lang_submit}">
- <input type="submit" name="cancel"
value="{lang_cancel}">
- </td>
- </tr>
+ <tfoot>
+ <tr>
+ <td colspan="2">
+
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" align="center">
+ <input type="submit" name="submit"
value="{lang_submit}">
+ <input type="submit" name="cancel"
value="{lang_cancel}">
+ </td>
+ </tr>
+ </tfoot>
</table>
</form>
<!-- END footer -->
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-08 19:00:00 UTC (rev 16285)
+++ branches/Version-2_0-branch/property/inc/class.botts.inc.php
2017-02-08 19:00:51 UTC (rev 16286)
@@ -100,6 +100,21 @@
$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))
+ {
+ if($default_interface == 'simplified')
+ {
+ $this->simple = false;
+ }
+ else
+ {
+ $this->simple = true;
+ }
+ break;
+ }
+ }
if
(isset($this->config->config_data['fmtts_assign_group_candidates']) &&
is_array($this->config->config_data['fmtts_assign_group_candidates']))
{
foreach
($this->config->config_data['fmtts_assign_group_candidates'] as
$group_candidate)
@@ -110,34 +125,18 @@
}
}
}
+ reset($user_groups);
+
foreach ( $user_groups as $group => $dummy)
{
- if ( in_array($group, $simple_group) &&
!in_array($group, $this->group_candidates))
+ if ( in_array($group, $this->group_candidates))
{
- $this->simple = true;
+ $this->simple = false;
break;
}
}
reset($user_groups);
- $user_groups =
$GLOBALS['phpgw']->accounts->membership($this->account);
- foreach ($user_groups as $group => $dummy)
- {
- if (in_array($group, $simple_group))
- {
- if($default_interface == 'simplified')
- {
- $this->simple = false;
- }
- else
- {
- $this->simple = true;
- }
- break;
- }
- }
-
- reset($user_groups);
$group_finnish_date =
isset($this->config->config_data['fmtts_group_finnish_date']) ?
$this->config->config_data['fmtts_group_finnish_date'] : array();
foreach ($user_groups as $group => $dummy)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16286] Stable: Merge 16284:16285 from trunk,
sigurdne <=