[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17360] Stable: Merge 17358:17359 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17360] Stable: Merge 17358:17359 from trunk |
|
Date: |
Fri, 24 Nov 2017 05:46:39 -0500 (EST) |
Revision: 17360
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17360
Author: sigurdne
Date: 2017-11-24 05:46:39 -0500 (Fri, 24 Nov 2017)
Log Message:
-----------
Stable: Merge 17358:17359 from trunk
Modified Paths:
--------------
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/templates/base/config.tpl
branches/Version-2_0-branch/helpdesk/templates/base/tts.xsl
branches/Version-2_0-branch/property/inc/class.multiuploader.inc.php
Removed Paths:
-------------
branches/Version-2_0-branch/helpdesk/templates/base/files.xsl
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-11-24 10:45:37 UTC (rev 17359)
+++ branches/Version-2_0-branch 2017-11-24 10:46:39 UTC (rev 17360)
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,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167,17169-17173,17175-17188,17190-17195,17197-17205,17207-17212,17214,17216-17277,17279,17281,17283-17285,17287-17288,17290-17301,17303-17311,17313-17314,17316-17317,17319,17321-17330,17332-17333,17335-17340,17342,17344-17346,17349-17351,17353-17354,17356-17357
\ 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,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167,17169-17173,17175-17188,17190-17195,17197-17205,17207-17212,17214,17216-17277,17279,17281,17283-17285,17287-17288,17290-17301,17303-17311,17313-17314,17316-17317,17319,17321-17330,17332-17333,17335-17340,17342,17344-17346,17349-17351,17353-17354,17356-17357,17359
\ 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-11-24 10:45:37 UTC (rev 17359)
+++ branches/Version-2_0-branch/helpdesk/inc/class.uitts.inc.php
2017-11-24 10:46:39 UTC (rev 17360)
@@ -52,7 +52,9 @@
'update_data' => true,
'upload_clip' => true,
'view_image' => true,
- 'get_reverse_assignee'=>true
+ 'get_reverse_assignee'=>true,
+ 'handle_multi_upload_file' => true,
+ 'build_multi_upload_file' => true
);
/**
@@ -546,6 +548,60 @@
}
}
+ public function handle_multi_upload_file()
+ {
+ $id = phpgw::get_var('id');
+
+ phpgw::import_class('property.multiuploader');
+
+ $options['fakebase'] = "/helpdesk";
+ $options['base_dir'] = $id;
+ $options['upload_dir'] =
$GLOBALS['phpgw_info']['server']['files_dir'].'/helpdesk/'.$options['base_dir'].'/';
+ $options['script_url'] =
html_entity_decode(self::link(array('menuaction' =>
'helpdesk.uitts.handle_multi_upload_file', 'id' => $id)));
+ $upload_handler = new property_multiuploader($options,
false);
+
+ switch ($_SERVER['REQUEST_METHOD']) {
+ case 'OPTIONS':
+ case 'HEAD':
+ $upload_handler->head();
+ break;
+ case 'GET':
+ $upload_handler->get();
+ break;
+ case 'PATCH':
+ case 'PUT':
+ case 'POST':
+ $upload_handler->add_file();
+ break;
+ case 'DELETE':
+ $upload_handler->delete_file();
+ break;
+ default:
+ $upload_handler->header('HTTP/1.1 405
Method Not Allowed');
+ }
+
+ $GLOBALS['phpgw']->common->phpgw_exit();
+ }
+
+ public function build_multi_upload_file()
+ {
+ phpgwapi_jquery::init_multi_upload_file();
+ $id = phpgw::get_var('id', 'int');
+
+ $GLOBALS['phpgw_info']['flags']['noframework'] = true;
+ $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
+
+ $multi_upload_action =
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'helpdesk.uitts.handle_multi_upload_file', 'id' => $id));
+
+ $data = array
+ (
+ 'multi_upload_action' => $multi_upload_action
+ );
+
+ $GLOBALS['phpgw']->xslttpl->add_file(array('files',
'multi_upload_file'));
+ $GLOBALS['phpgw']->xslttpl->set_var('phpgw',
array('multi_upload' => $data));
+ }
+
function columns()
{
$receipt = array();
@@ -1613,7 +1669,7 @@
$link_file_data = array
(
- 'menuaction' => 'property.uitts.view_file',
+ 'menuaction' => 'helpdesk.uitts.view_file',
);
@@ -2158,8 +2214,9 @@
'contact_phone' => $ticket['contact_phone'],
'pref_send_mail' =>
isset($GLOBALS['phpgw_info']['user']['preferences']['helpdesk']['tts_user_mailnotification'])
?
$GLOBALS['phpgw_info']['user']['preferences']['helpdesk']['tts_user_mailnotification']
: '',
'fileupload' =>
true,//isset($this->bo->config->config_data['fmttsfileupload']) ?
$this->bo->config->config_data['fmttsfileupload'] : '',
- // 'multiple_uploader' => true,
- 'fileuploader_action' =>
"{menuaction:'property.fileuploader.add',upload_target:'helpdesk.botts.addfiles',id:'{$id}'}",
+ 'multiple_uploader' => true,
+ 'multi_upload_parans' =>
"{menuaction:'helpdesk.uitts.build_multi_upload_file', id:'{$id}'}",
+// 'fileuploader_action' =>
"{menuaction:'property.fileuploader.add',upload_target:'helpdesk.botts.addfiles',id:'{$id}'}",
'link_to_files' =>
isset($this->bo->config->config_data['files_url']) ?
$this->bo->config->config_data['files_url'] : '',
'files' => isset($ticket['files']) ?
$ticket['files'] : '',
'lang_filename' => lang('Filename'),
Modified: branches/Version-2_0-branch/helpdesk/js/portico/tts.view.js
===================================================================
--- branches/Version-2_0-branch/helpdesk/js/portico/tts.view.js 2017-11-24
10:45:37 UTC (rev 17359)
+++ branches/Version-2_0-branch/helpdesk/js/portico/tts.view.js 2017-11-24
10:46:39 UTC (rev 17360)
@@ -96,11 +96,16 @@
}
}
-
this.fileuploader = function ()
{
- var sUrl = phpGWLink('index.php', fileuploader_action);
- TINY.box.show({iframe: sUrl, boxid: "frameless", width: 750, height:
450, fixed: false, maskid: "darkmask", maskopacity: 40, mask: true, animate:
true, close: true}); //refresh_files is called after upload
+ var sUrl = phpGWLink('index.php', multi_upload_parans);
+ TINY.box.show({iframe: sUrl, boxid: 'frameless', width: 750, height:
450, fixed: false, maskid: 'darkmask', maskopacity: 40, mask: true, animate:
true,
+ close: true,
+ closejs: function ()
+ {
+ refresh_files()
+ }
+ });
};
this.refresh_files = function ()
Modified: branches/Version-2_0-branch/helpdesk/templates/base/config.tpl
===================================================================
--- branches/Version-2_0-branch/helpdesk/templates/base/config.tpl
2017-11-24 10:45:37 UTC (rev 17359)
+++ branches/Version-2_0-branch/helpdesk/templates/base/config.tpl
2017-11-24 10:46:39 UTC (rev 17360)
@@ -57,14 +57,14 @@
{lang_default}: {lang_Open}</td>
<td><input name="newsettings[tts_lang_open]"
value="{value_tts_lang_open}"></td>
</tr>
- <tr>
- <td>{lang_reopen_status}:</td>
- <td>
- <select
name="newsettings[reopen_status]">
- {hook_reopen_status}
- </select>
- </td>
- <tr>
+ <tr>
+ <td>{lang_reopen_status}:</td>
+ <td>
+ <select name="newsettings[reopen_status]">
+ {hook_reopen_status}
+ </select>
+ </td>
+ <tr>
<tr class="pure-table-odd">
<td >{lang_TTS_disable_assign_to_user_on_add}:</td>
<td>
@@ -232,6 +232,10 @@
</select>
</td>
</tr>
+ <tr>
+ <td>{lang_uploader_filetypes}: jpg,gif,png</td>
+ <td><input name="newsettings[uploader_filetypes]"
value="{value_uploader_filetypes}"></td>
+ </tr>
<!-- END body -->
<!-- BEGIN footer -->
Deleted: branches/Version-2_0-branch/helpdesk/templates/base/files.xsl
===================================================================
--- branches/Version-2_0-branch/helpdesk/templates/base/files.xsl
2017-11-24 10:45:37 UTC (rev 17359)
+++ branches/Version-2_0-branch/helpdesk/templates/base/files.xsl
2017-11-24 10:46:39 UTC (rev 17360)
@@ -1,53 +0,0 @@
-
-<!-- $Id: files.xsl 15892 2016-10-24 13:50:59Z sigurdne $ -->
-
-<xsl:template name="multi_upload">
- <xsl:apply-templates select="multi_upload"/>
-</xsl:template>
-
-<xsl:template xmlns:php="http://php.net/xsl"; match="multi_upload">
- <xsl:call-template name="multi_upload_file"/>
-</xsl:template>
-
-
-<!-- New template-->
-<xsl:template xmlns:php="http://php.net/xsl"; name="file_upload">
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang', 'upload
files')"/>
- </label>
- <input type="file" name="file" size="40" class="pure-input-1-2"
>
- <xsl:attribute name="title">
- <xsl:value-of select="php:function('lang',
'Select file to upload')"/>
- </xsl:attribute>
- </input>
- </div>
- <xsl:choose>
- <xsl:when test="multiple_uploader!=''">
- <div class="pure-control-group">
- <label>
- <a href="javascript:fileuploader()">
- <xsl:attribute name="title">
- <xsl:value-of
select="php:function('lang', 'upload multiple files')"/>
- </xsl:attribute>
- <xsl:value-of
select="php:function('lang', 'upload multiple files')"/>
- </a>
- </label>
- </div>
- </xsl:when>
- </xsl:choose>
-</xsl:template>
-
-<!-- New template-->
-<xsl:template xmlns:php="http://php.net/xsl"; name="jasper_upload">
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang', 'jasper
upload')"/>
- </label>
- <input type="file" name="jasperfile" size="40">
- <xsl:attribute name="title">
- <xsl:value-of select="php:function('lang',
'upload a jasper definition file')"/>
- </xsl:attribute>
- </input>
- </div>
-</xsl:template>
Modified: branches/Version-2_0-branch/helpdesk/templates/base/tts.xsl
===================================================================
--- branches/Version-2_0-branch/helpdesk/templates/base/tts.xsl 2017-11-24
10:45:37 UTC (rev 17359)
+++ branches/Version-2_0-branch/helpdesk/templates/base/tts.xsl 2017-11-24
10:46:39 UTC (rev 17360)
@@ -595,7 +595,7 @@
<xsl:choose>
<xsl:when test="fileupload = 1">
<script
type="text/javascript">
- var
fileuploader_action = <xsl:value-of select="fileuploader_action"/>;
+ var
multi_upload_parans = <xsl:value-of select="multi_upload_parans"/>;
</script>
<xsl:call-template
name="file_upload"/>
</xsl:when>
Modified: branches/Version-2_0-branch/property/inc/class.multiuploader.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.multiuploader.inc.php
2017-11-24 10:45:37 UTC (rev 17359)
+++ branches/Version-2_0-branch/property/inc/class.multiuploader.inc.php
2017-11-24 10:46:39 UTC (rev 17360)
@@ -362,7 +362,26 @@
return $this->generate_response($response,
$print_response);
}
- public function generate_response($content, $print_response =
true) {
+ public function generate_response($_content, $print_response =
true) {
+
+ $content = array();
+ /**
+ * Filter out thumbs as individual entries
+ */
+
+ if(!empty($_content['files']))
+ {
+ $content['files'] = array();
+ foreach ($_content['files'] as $file)
+ {
+ if(substr($file->name, -5) == 'thumb')
+ {
+ continue;
+ }
+ $content['files'][] = $file;
+ }
+ }
+
$this->response = $content;
if ($print_response)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17360] Stable: Merge 17358:17359 from trunk,
sigurdne <=