[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16866] Stable: Merge 16862:16865 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16866] Stable: Merge 16862:16865 from trunk |
|
Date: |
Tue, 13 Jun 2017 12:06:36 -0400 (EDT) |
Revision: 16866
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16866
Author: sigurdne
Date: 2017-06-13 12:06:35 -0400 (Tue, 13 Jun 2017)
Log Message:
-----------
Stable: Merge 16862:16865 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/helpdesk/inc/class.botts.inc.php
branches/Version-2_0-branch/helpdesk/inc/class.menu.inc.php
branches/Version-2_0-branch/helpdesk/inc/class.sogeneric.inc.php
branches/Version-2_0-branch/helpdesk/inc/class.sotts.inc.php
branches/Version-2_0-branch/helpdesk/inc/class.uicustom.inc.php
branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang
branches/Version-2_0-branch/helpdesk/templates/base/config.tpl
branches/Version-2_0-branch/helpdesk/templates/base/tts.xsl
branches/Version-2_0-branch/property/inc/class.uicustom.inc.php
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-06-13 16:05:18 UTC (rev 16865)
+++ branches/Version-2_0-branch 2017-06-13 16:06:35 UTC (rev 16866)
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
\ 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
\ 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-06-13 16:05:18 UTC (rev 16865)
+++ branches/Version-2_0-branch/helpdesk/inc/class.botts.inc.php
2017-06-13 16:06:35 UTC (rev 16866)
@@ -127,6 +127,11 @@
'id' => 'assignedto',
'name' => lang('assigned to')
);
+ $columns['category'] = array
+ (
+ 'id' => 'category',
+ 'name' => lang('category')
+ );
$columns['billable_hours'] = array(
'id' => 'billable_hours',
@@ -211,7 +216,7 @@
return $this->bocommon->select_list($selected,$filters);
}
- function get_status_list($selected)
+ function get_status_list($selected = '')
{
$status = $this->_get_status_list();
return $this->bocommon->select_list($selected,$status);
@@ -770,6 +775,12 @@
function mail_ticket($id, $fields_updated, $receipt = array(),
$get_message = false)
{
+ //No message on assignment
+ if(!$get_message && is_array($fields_updated) &&
count($fields_updated) == 1 && in_array('assignedto', $fields_updated))
+ {
+ return;
+ }
+
$log_recipients = array();
$this->send =
CreateObject('phpgwapi.send');
@@ -819,12 +830,40 @@
$link_text = lang('Ticket') . ' #' . $id ;
$messages_sendt =
$this->historylog->return_array(array(),array('M'),'history_timestamp','DESC',$id);
+ $additional_notes = $this->read_additional_notes($id);
+ $num_updates = count($additional_notes) +1;
+ //New message
+ if(!$get_message &&
!empty($this->config->config_data['new_message']))
+ {
+ $link_text =
"<H2>{$this->config->config_data['new_message']}</H2>";
+ $link_text = nl2br(str_replace(array('__ID__'),
array($id, $num_updates), $link_text));
+ }
+
+ // Normal update message
if(!$get_message &&
!empty($this->config->config_data['update_message']) && $messages_sendt)
{
$link_text =
"<H2>{$this->config->config_data['update_message']}</H2>";
+ $link_text = nl2br(str_replace(array('__ID__',
'__#__'), array($id, $num_updates), $link_text));
}
+ $status_closed = array('X' => true);
+ $custom_status = $this->so->get_custom_status();
+ foreach($custom_status as $custom)
+ {
+ $status_closed["C{$custom['id']}"] =
!!$custom['closed'];
+ }
+
+
+ //Message when ticket is closed
+ if(!$get_message &&
!empty($this->config->config_data['close_message']) &&
$status_closed[$ticket['status']])
+ {
+ $link_text =
"<H4>{$this->config->config_data['close_message']}</H4>";
+ $link_text = nl2br(str_replace(array('__ID__',
'__#__'), array($id, $num_updates), $link_text));
+ }
+
+ //message when closed;
+
$body = '<a href ="' .
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'helpdesk.uitts.view',
'id' => $id), false, true) . '">' .
$link_text . '</a>' . "\n";
@@ -910,9 +949,6 @@
$table_content .=
"<tr><td>{$i}</td><td>{$entry_date}</td><td>{$user_name}</td><td>{$ticket['details']}</td></tr>";
-
- $additional_notes =
$this->read_additional_notes($id);
-
foreach ($additional_notes as $value)
{
$table_content .=
"<tr><td>{$value['value_count']}</td><td>{$value['value_date']}</td><td>{$value['value_user']}</td><td>{$value['value_note']}</td></tr>";
Modified: branches/Version-2_0-branch/helpdesk/inc/class.menu.inc.php
===================================================================
--- branches/Version-2_0-branch/helpdesk/inc/class.menu.inc.php 2017-06-13
16:05:18 UTC (rev 16865)
+++ branches/Version-2_0-branch/helpdesk/inc/class.menu.inc.php 2017-06-13
16:06:35 UTC (rev 16866)
@@ -174,7 +174,7 @@
'type' =>
'email_template', 'admin' => true))
),
'recipient_set' => array(
- 'text' =>
lang('recipient set'),
+ 'text' => lang('admin
recipient set'),
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'helpdesk.uigeneric.index',
'type' =>
'email_recipient_set', 'admin' => true))
),
Modified: branches/Version-2_0-branch/helpdesk/inc/class.sogeneric.inc.php
===================================================================
--- branches/Version-2_0-branch/helpdesk/inc/class.sogeneric.inc.php
2017-06-13 16:05:18 UTC (rev 16865)
+++ branches/Version-2_0-branch/helpdesk/inc/class.sogeneric.inc.php
2017-06-13 16:06:35 UTC (rev 16866)
@@ -228,7 +228,7 @@
),
'edit_msg' => lang('edit'),
'add_msg' => lang('add'),
- 'name' => lang('recipient set'),
+ 'name' => lang('admin recipient
set'),
'acl_app' => 'helpdesk',
'system_location' =>
'.email_out.recipient_set',
'acl_location' => '.email_out',
Modified: branches/Version-2_0-branch/helpdesk/inc/class.sotts.inc.php
===================================================================
--- branches/Version-2_0-branch/helpdesk/inc/class.sotts.inc.php
2017-06-13 16:05:18 UTC (rev 16865)
+++ branches/Version-2_0-branch/helpdesk/inc/class.sotts.inc.php
2017-06-13 16:06:35 UTC (rev 16866)
@@ -662,7 +662,8 @@
(
'id' => $this->db->f('id'),
'name' => $this->db->f('name',
true),
- 'color' => $this->db->f('color')
+ 'color' =>
$this->db->f('color'),
+ 'closed'=>
$this->db->f('color'),
);
}
return $status;
Modified: branches/Version-2_0-branch/helpdesk/inc/class.uicustom.inc.php
===================================================================
--- branches/Version-2_0-branch/helpdesk/inc/class.uicustom.inc.php
2017-06-13 16:05:18 UTC (rev 16865)
+++ branches/Version-2_0-branch/helpdesk/inc/class.uicustom.inc.php
2017-06-13 16:06:35 UTC (rev 16866)
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage custom
- * @version $Id: class.uicustom.inc.php 14987 2016-05-09 13:02:55Z
sigurdne $
+ * @version $Id: class.uicustom.inc.php 15977 2016-11-09 13:56:30Z
sigurdne $
*/
/**
* Description
@@ -34,9 +34,10 @@
class helpdesk_uicustom extends property_uicustom
{
- function __construct()
+ public function __construct()
{
+ $GLOBALS['phpgw']->translation->add_app('property');
parent::__construct();
$GLOBALS['phpgw_info']['flags']['menu_selection'] =
'helpdesk::report';
}
- }
\ No newline at end of file
+ }
Modified: branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang 2017-06-13
16:05:18 UTC (rev 16865)
+++ branches/Version-2_0-branch/helpdesk/setup/phpgw_no.lang 2017-06-13
16:06:35 UTC (rev 16866)
@@ -193,7 +193,7 @@
select all helpdesk no Velg alle
planned helpdesk no Planlagt
email template helpdesk no Standardtekster
-recipient set helpdesk no mottaker sett
+admin recipient set helpdesk no Admin mottakerlister
list helpdesk no List
recipient list helpdesk no Mottaker liste
select helpdesk no Velg
@@ -202,4 +202,9 @@
generic helpdesk no Generelt
reverse helpdesk no Revers tildeling
owned by helpdesk no Eies av
-update message helpdesk no Oppdateringsmelding
\ No newline at end of file
+new message helpdesk no Svarmelding ved ny sak
+update message helpdesk no Svarmelding ved oppdatert sak
+close message helpdesk no Svarmelding ved avlsuttet sak
+list %1 helpdesk no List %1
+public helpdesk no synlig for alle
+open edit in new window helpdesk no Editer i nytt vindu
\ 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-06-13 16:05:18 UTC (rev 16865)
+++ branches/Version-2_0-branch/helpdesk/templates/base/config.tpl
2017-06-13 16:06:35 UTC (rev 16866)
@@ -20,10 +20,19 @@
<td><input name="newsettings[app_name]"
value="{value_app_name}"></td>
</tr>
<tr>
- <td>{lang_update_message}: </td>
+ <td>{lang_new_message}:</br> '__ID__' </td>
+ <td><input name="newsettings[new_message]"
value="{value_new_message}"></td>
+ </tr>
+ <tr>
+ <td>{lang_update_message}:</br> '__ID__', '__#__' </td>
<td><input name="newsettings[update_message]"
value="{value_update_message}"></td>
</tr>
<tr>
+ <td>{lang_close_message}:</br> '__ID__', '__#__'</td>
+ <td><input name="newsettings[close_message]"
value="{value_close_message}"></td>
+ </tr>
+
+ <tr>
<td>{lang_from_email}: <br>
<td><input name="newsettings[from_email]"
value="{value_from_email}"></td>
</tr>
Modified: branches/Version-2_0-branch/helpdesk/templates/base/tts.xsl
===================================================================
--- branches/Version-2_0-branch/helpdesk/templates/base/tts.xsl 2017-06-13
16:05:18 UTC (rev 16865)
+++ branches/Version-2_0-branch/helpdesk/templates/base/tts.xsl 2017-06-13
16:06:35 UTC (rev 16866)
@@ -20,6 +20,13 @@
<xsl:value-of select="lookup_functions"/>
var my_groups = <xsl:value-of select="my_groups"/>;
var lang = <xsl:value-of select="php:function('js_lang',
'Please select a person or a group to handle the ticket !')"/>;
+
+ function response_lookup()
+ {
+ 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>
<dl>
@@ -182,11 +189,25 @@
</input>
</div>
<div class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'Details')"/>
- </label>
+ <xsl:choose>
+ <xsl:when test="simple
!='1'">
+ <label>
+ <a
href="javascript:response_lookup()">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'standard text')"/>
+
</xsl:attribute>
+
<xsl:value-of select="php:function('lang', 'standard text')"/>
+ </a>
+ </label>
+ </xsl:when>
+ <xsl:otherwise>
+ <label>
+
<xsl:value-of select="php:function('lang', 'new note')"/>
+ </label>
+ </xsl:otherwise>
+ </xsl:choose>
- <textarea cols="60" rows="10"
name="values[details]" class="pure-input-1-2" >
+ <textarea cols="60" rows="10"
name="values[details]" id="new_note" class="pure-input-1-2" >
<xsl:attribute
name="title">
<xsl:value-of
select="php:function('lang', 'Enter the details of this ticket')"/>
</xsl:attribute>
Modified: branches/Version-2_0-branch/property/inc/class.uicustom.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uicustom.inc.php
2017-06-13 16:05:18 UTC (rev 16865)
+++ branches/Version-2_0-branch/property/inc/class.uicustom.inc.php
2017-06-13 16:06:35 UTC (rev 16866)
@@ -94,6 +94,16 @@
$this->acl_edit = $this->acl->check('.custom',
PHPGW_ACL_EDIT, $this->currentapp);
$this->acl_delete = $this->acl->check('.custom',
PHPGW_ACL_DELETE, $this->currentapp);
$this->xsl_rootdir = PHPGW_SERVER_ROOT .
"/property/templates/base";
+ $this->config =
CreateObject('phpgwapi.config',$this->currentapp);
+ $this->config->read();
+ if (!empty($this->config->config_data['app_name']))
+ {
+ $this->lang_app_name =
$this->config->config_data['app_name'];
+ }
+ else
+ {
+ $this->lang_app_name = lang($this->currentapp);
+ }
}
function index()
@@ -117,7 +127,7 @@
$appname = lang('custom');
$function_msg = lang('list custom');
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
$this->lang_app_name . ' - ' . $appname . ': ' . $function_msg;
$data = array(
'datatable_name' => $appname,
@@ -490,7 +500,7 @@
$appname = lang('custom');
$function_msg = lang('delete custom');
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
$this->lang_app_name . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',
array('delete' => $data));
}
@@ -505,7 +515,7 @@
$custom = $this->bo->read_single($custom_id);
- $appname = lang($this->currentapp);
+ $appname = $this->lang_app_name;
$function_msg = $custom['name'];
$GLOBALS['phpgw_info']['flags']['app_header'] =
$appname . ': ' . $function_msg;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16866] Stable: Merge 16862:16865 from trunk,
sigurdne <=