[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17093] Stable: Merge 17091:17092 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17093] Stable: Merge 17091:17092 from trunk |
|
Date: |
Mon, 18 Sep 2017 09:57:07 -0400 (EDT) |
Revision: 17093
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17093
Author: sigurdne
Date: 2017-09-18 09:57:07 -0400 (Mon, 18 Sep 2017)
Log Message:
-----------
Stable: Merge 17091:17092 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/helpdesk/inc/class.botts.inc.php
branches/Version-2_0-branch/helpdesk/inc/class.sotts.inc.php
branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
branches/Version-2_0-branch/helpdesk/js/portico/tts.view.js
branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang
branches/Version-2_0-branch/helpdesk/templates/base/tts.xsl
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-09-18 13:54:30 UTC (rev 17092)
+++ branches/Version-2_0-branch 2017-09-18 13:57:07 UTC (rev 17093)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16846
/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,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090
\ 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,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092
\ No newline at end of property
Modified: branches/Version-2_0-branch/helpdesk/inc/class.botts.inc.php
===================================================================
--- branches/Version-2_0-branch/helpdesk/inc/class.botts.inc.php
2017-09-18 13:54:30 UTC (rev 17092)
+++ branches/Version-2_0-branch/helpdesk/inc/class.botts.inc.php
2017-09-18 13:57:07 UTC (rev 17093)
@@ -267,6 +267,7 @@
'SC' => lang('Status changed'),
'M' => lang('Sent by email to'),
'AC'=> lang('actual cost changed'),
+ 'FW'=> lang('ticket is forwarded'),
);
$custom_status = $this->so->get_custom_status();
@@ -600,6 +601,7 @@
case 'IF': $type = lang('Initial finnish
date'); break;
case 'L': $type = lang('Location changed');
break;
case 'AC': $type = lang('actual cost changed');
break;
+ case 'FW': $type = lang('ticket is forwarded');
break;
case 'M':
$type = lang('Sent by email to');
$this->order_sent_adress =
$value['new_value']; // in case we want to resend the order as an reminder
@@ -646,6 +648,11 @@
$record_history[$i]['value_new_value']
= $this->get_category_name($value['new_value']);
$record_history[$i]['value_old_value']
= $this->get_category_name($value['old_value']);
}
+ else if ($value['status'] == 'FW')
+ {
+ $record_history[$i]['value_new_value']
= $GLOBALS['phpgw']->accounts->get($value['new_value'])->__toString();
+ $record_history[$i]['value_old_value']
= $GLOBALS['phpgw']->accounts->get($value['old_value'])->__toString();
+ }
else if (($value['status'] == 'F') ||
($value['status'] =='IF'))
{
$record_history[$i]['value_new_value']
= $GLOBALS['phpgw']->common->show_date($value['new_value'],$this->dateformat);
Modified: branches/Version-2_0-branch/helpdesk/inc/class.sotts.inc.php
===================================================================
--- branches/Version-2_0-branch/helpdesk/inc/class.sotts.inc.php
2017-09-18 13:54:30 UTC (rev 17092)
+++ branches/Version-2_0-branch/helpdesk/inc/class.sotts.inc.php
2017-09-18 13:57:07 UTC (rev 17093)
@@ -789,8 +789,8 @@
$old_order_cat_id = $this->db->f('order_cat_id');
$old_building_part = $this->db->f('building_part',
true);
$old_order_dim1 = (int)$this->db->f('order_dim1');
+ $old_user_id = $this->db->f('user_id');
-
if ($oldcat_id == 0)
{
$oldcat_id = '';
@@ -838,6 +838,7 @@
* * C% - Status change
* * L - Location changed
* * M - Mail sent to vendor
+ * * FW - Forwarded
*/
if (!$simple)
@@ -1060,6 +1061,14 @@
$receipt['message'][] = array('msg' =>
lang('billable hours has been updated'));
}
+ if (!empty($ticket['forward_user_id']) && $old_user_id
!= $ticket['forward_user_id'] && $oldassigned == $this->account)
+ {
+ $forward_user_id = (int)
$ticket['forward_user_id'];
+ $this->db->query("UPDATE phpgw_helpdesk_tickets
SET user_id = {$forward_user_id}"
+ . " WHERE id='{$id}'", __LINE__,
__FILE__);
+ $this->historylog->add('FW', $id,
$forward_user_id, $old_user_id);
+ $receipt['message'][] = array('msg' =>
lang('ticket is forwarded'));
+ }
$value_set = array();
Modified: branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
===================================================================
--- branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
2017-09-18 13:54:30 UTC (rev 17092)
+++ branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
2017-09-18 13:57:07 UTC (rev 17093)
@@ -2085,8 +2085,9 @@
'type' => 'tax', 'selected' =>
$ticket['tax_code'], 'order' => 'id',
'id_in_name' => 'num'))),
'tabs' =>
phpgwapi_jquery::tabview_generate($tabs, $active_tab),
+ 'forward_user' => ($ticket['user_id'] !=
$ticket['reverse_id'] && $ticket['assignedto'] == $this->account) ? true :
false
);
-
+
phpgwapi_jquery::load_widget('numberformat');
phpgwapi_jquery::load_widget('autocomplete');
self::add_javascript('helpdesk', 'portico',
'tts.view.js');
Modified: branches/Version-2_0-branch/helpdesk/js/portico/tts.view.js
===================================================================
--- branches/Version-2_0-branch/helpdesk/js/portico/tts.view.js 2017-09-18
13:54:30 UTC (rev 17092)
+++ branches/Version-2_0-branch/helpdesk/js/portico/tts.view.js 2017-09-18
13:57:07 UTC (rev 17093)
@@ -327,3 +327,7 @@
}
});
+
+var oArgs = {menuaction: 'helpdesk.uitts.get_reverse_assignee'};
+var strURL = phpGWLink('index.php', oArgs, true);
+JqueryPortico.autocompleteHelper(strURL, 'forward_user_name',
'forward_user_id', 'forward_user_container');
Modified: branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang 2017-09-18
13:54:30 UTC (rev 17092)
+++ branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang 2017-09-18
13:57:07 UTC (rev 17093)
@@ -215,3 +215,5 @@
ticket categories helpdesk no Meldingskategorier
ticket status helpdesk no Meldingsstatus
url helpdesk no Url
+forward helpdesk no Videresend
+ticket is forwarded helpdesk no Melding er videresendt
\ No newline at end of file
Modified: branches/Version-2_0-branch/helpdesk/templates/base/tts.xsl
===================================================================
--- branches/Version-2_0-branch/helpdesk/templates/base/tts.xsl 2017-09-18
13:54:30 UTC (rev 17092)
+++ branches/Version-2_0-branch/helpdesk/templates/base/tts.xsl 2017-09-18
13:57:07 UTC (rev 17093)
@@ -23,8 +23,8 @@
function response_lookup()
{
- var oArgs =
{menuaction:'helpdesk.uilookup.response_template',type:'response_template'};
- var strURL = phpGWLink('index.php', oArgs);
+ var oArgs =
{menuaction:'helpdesk.uilookup.response_template',type:'response_template'};
+ var strURL = phpGWLink('index.php', oArgs);
TINY.box.show({iframe:strURL,
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});
}
</script>
@@ -343,6 +343,20 @@
</label>
<xsl:value-of
select="value_owned_by"/>
</div>
+ <xsl:if test="forward_user ='1'">
+ <div class="pure-control-group">
+ <xsl:variable
name="lang_forward">
+ <xsl:value-of
select="php:function('lang', 'forward')"/>
+ </xsl:variable>
+ <label>
+ <xsl:value-of
select="$lang_forward"/>
+ </label>
+ <input type="hidden"
id="forward_user_id" name="values[forward_user_id]"
value="{value_forward_user}"/>
+ <input type="text"
id="forward_user_name" name="values[forward_user_name]"
value="{value_forward_user_name}" class="pure-input-1-2">
+ </input>
+ <div
id="forward_user_container"/>
+ </div>
+ </xsl:if>
<xsl:for-each select="value_origin">
<div class="pure-control-group">
<label>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17093] Stable: Merge 17091:17092 from trunk,
sigurdne <=