[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16762] Stable: Merge 16758:16761 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16762] Stable: Merge 16758:16761 from trunk |
|
Date: |
Sat, 20 May 2017 14:07:51 -0400 (EDT) |
Revision: 16762
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16762
Author: sigurdne
Date: 2017-05-20 14:07:51 -0400 (Sat, 20 May 2017)
Log Message:
-----------
Stable: Merge 16758:16761 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/helpdesk/inc/class.botts.inc.php
branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang
branches/Version-2_0-branch/helpdesk/templates/base/config.tpl
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-05-20 18:04:45 UTC (rev 16761)
+++ branches/Version-2_0-branch 2017-05-20 18:07:51 UTC (rev 16762)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16738
/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
\ 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
\ 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-05-20 18:04:45 UTC (rev 16761)
+++ branches/Version-2_0-branch/helpdesk/inc/class.botts.inc.php
2017-05-20 18:07:51 UTC (rev 16762)
@@ -702,7 +702,7 @@
if ((isset($data['send_mail']) && $data['send_mail'])
|| (isset($this->config->config_data['mailnotification']) &&
$this->config->config_data['mailnotification'])
)
{
- $receipt_mail =
$this->mail_ticket($receipt['id'], false, $receipt, $data['location_code'],
false, isset($data['send_mail']) && $data['send_mail'] ? true : false);
+ $receipt_mail =
$this->mail_ticket($receipt['id'], false, $receipt, false,
isset($data['send_mail']) && $data['send_mail'] ? true : false);
}
reset($custom_functions);
@@ -768,7 +768,7 @@
return $address_element;
}
- function mail_ticket($id, $fields_updated, $receipt =
array(),$location_code='', $get_message = false)
+ function mail_ticket($id, $fields_updated, $receipt = array(),
$get_message = false)
{
$log_recipients = array();
$this->send =
CreateObject('phpgwapi.send');
@@ -789,7 +789,7 @@
$group_name=
$GLOBALS['phpgw']->accounts->id2name($ticket['group_id']);
// build subject
- $subject = '['.lang('Ticket').' #'.$id.'] : ' .
$location_code .' ' .$this->get_category_name($ticket['cat_id']) . '; '
.$ticket['subject'];
+ $subject = '['.lang('Ticket').' #'.$id.'] : ' .
$this->get_category_name($ticket['cat_id']) . '; ' .$ticket['subject'];
$prefs_user =
$this->bocommon->create_preferences('helpdesk',$ticket['user_id']);
@@ -815,12 +815,22 @@
{
$GLOBALS['phpgw_info']['server']['enforce_ssl']
= true;
}
+
+ $link_text = lang('Ticket') . ' #' . $id ;
+
+ $messages_sendt =
$this->historylog->return_array(array(),array('M'),'history_timestamp','DESC',$id);
+
+ if(!$get_message &&
!empty($this->config->config_data['update_message']) && $messages_sendt)
+ {
+ $link_text =
"<H2>{$this->config->config_data['update_message']}</H2>";
+ }
+
$body = '<a href ="' .
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'helpdesk.uitts.view',
- 'id' => $id), false, true) . '">' .
lang('Ticket') . ' #' . $id . '</a>' . "\n";
+ 'id' => $id), false, true) . '">' .
$link_text . '</a>' . "\n";
$body .= "<table>";
$body .= '<tr><td>'. lang('Date
Opened').'</td><td>: '.$entry_date."</td></tr>";
- $body .= '<tr><td>'.
lang('status').'</td><td>: '.$status_text[$ticket['status']]."</td></tr>";
+ $body .= '<tr><td>'.
lang('status').'</td><td>: <b>'.$status_text[$ticket['status']]."</b></td></tr>";
$body .= '<tr><td>'.
lang('Category').'</td><td>: '.
$this->get_category_name($ticket['cat_id']) ."</td></tr>";
$body .= '<tr><td>'. lang('Assigned
To').'</td><td>: '.$GLOBALS['phpgw']->accounts->id2name($ticket['assignedto'])."</td></tr>";
Modified: branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
===================================================================
--- branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
2017-05-20 18:04:45 UTC (rev 16761)
+++ branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
2017-05-20 18:07:51 UTC (rev 16762)
@@ -313,7 +313,7 @@
$GLOBALS['phpgw_info']['flags']['xslt_app'] = false;
$id = phpgw::get_var('id', 'int');
- $ticket_html = $this->bo->mail_ticket($id,
$fields_updated = true, $receipt = array(), $location_code = '', $get_message =
true);
+ $ticket_html = $this->bo->mail_ticket($id,
$fields_updated = true, $receipt = array(), $get_message = true);
$ticket = $this->bo->read_single($id);
@@ -1688,7 +1688,7 @@
)
)
{
- $receipt = $this->bo->mail_ticket($id,
$this->bo->fields_updated, $receipt, '', false, isset($values['send_mail']) &&
$values['send_mail'] ? true : false);
+ $receipt = $this->bo->mail_ticket($id,
$this->bo->fields_updated, $receipt, false, isset($values['send_mail']) &&
$values['send_mail'] ? true : false);
}
//--------- files
Modified: branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang 2017-05-20
18:04:45 UTC (rev 16761)
+++ branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang 2017-05-20
18:07:51 UTC (rev 16762)
@@ -201,4 +201,5 @@
sent helpdesk no Sendt
generic helpdesk no Generelt
reverse helpdesk no Revers tildeling
-owned by helpdesk no Eies av
\ No newline at end of file
+owned by helpdesk no Eies av
+update message helpdesk no Oppdateringsmelding
\ No newline at end of file
Modified: branches/Version-2_0-branch/helpdesk/templates/base/config.tpl
===================================================================
--- branches/Version-2_0-branch/helpdesk/templates/base/config.tpl
2017-05-20 18:04:45 UTC (rev 16761)
+++ branches/Version-2_0-branch/helpdesk/templates/base/config.tpl
2017-05-20 18:07:51 UTC (rev 16762)
@@ -20,6 +20,10 @@
<td><input name="newsettings[app_name]"
value="{value_app_name}"></td>
</tr>
<tr>
+ <td>{lang_update_message}: </td>
+ <td><input name="newsettings[update_message]"
value="{value_update_message}"></td>
+ </tr>
+ <tr>
<td>{lang_from_email}: <br>
<td><input name="newsettings[from_email]"
value="{value_from_email}"></td>
</tr>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16762] Stable: Merge 16758:16761 from trunk,
sigurdne <=