holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mail - fix some tracker integration bugs:

Browse Source 
- Dialog had english title & buttons
- Append button didn't work
This commit is contained in:
nathangray 2017-11-22 10:10:46 -07:00
parent 41dece3d57
commit 28e6d4642a
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/inc/class.mail_integration.inc.php
View File

@ -88,6 +88,7 @@ class mail_integration {
} }
$data = static::get_integrate_data($_GET['rowid'], $_to_emailAddress, $_subject, $_body, $_attachments, $_date, $_rawMail, $_icServerID); $data = static::get_integrate_data($_GET['rowid'], $_to_emailAddress, $_subject, $_body, $_attachments, $_date, $_rawMail, $_icServerID);
$data['entry_id'] = $app_entry_id;
// Check if the hook is registered // Check if the hook is registered
if (Api\Hooks::exists('mail_import',$app) == 0) if (Api\Hooks::exists('mail_import',$app) == 0)
@ -122,8 +123,7 @@ class mail_integration {
* 'tmp_name' => string), // tmp dir path * 'tmp_name' => string), // tmp dir path
* 'message' => string, * 'message' => string,
* 'date' => string, * 'date' => string,
* 'subject' => string, * 'subject' => string
* 'entry_id => string // Id of the app entry which mail content will append to
* ) * )
* *
* @param string $_rowid * @param string $_rowid

14
mail/js/app.js
View File

@ -170,7 +170,7 @@ app.classes.mail = AppJS.extend(
// Set preview pane state // Set preview pane state
this.mail_disablePreviewArea(!this.getPreviewPaneState()); this.mail_disablePreviewArea(!this.getPreviewPaneState());
//Get initial folder status //Get initial folder status
this.mail_refreshFolderStatus(undefined,undefined,false); this.mail_refreshFolderStatus(undefined,undefined,false);
@ -3054,8 +3054,9 @@ app.classes.mail = AppJS.extend(
if (mail_import_hook && typeof mail_import_hook.app_entry_method != 'undefined') if (mail_import_hook && typeof mail_import_hook.app_entry_method != 'undefined')
{ {
var data = egw.dataGetUIDdata(_elems[0].id); var data = egw.dataGetUIDdata(_elems[0].id);
var title = egw.lang('Select') + ' ' + egw.lang(app) + ' ' + (egw.link_get_registry(app, 'entry') ? egw.link_get_registry(app, 'entry') : egw.lang('entry'));
var subject = (data && typeof data.data != 'undefined')? data.data.subject : ''; var subject = (data && typeof data.data != 'undefined')? data.data.subject : '';
this.integrate_checkAppEntry('Select '+ app + ' entry', app, subject, url, mail_import_hook.app_entry_method, function (args){ this.integrate_checkAppEntry(title, app, subject, url, mail_import_hook.app_entry_method, function (args){
egw_openWindowCentered(args.url+ (args.entryid ?'&entry_id=' + args.entryid: ''),'import_mail_'+_elems[0].id,w_h[0],w_h[1]); egw_openWindowCentered(args.url+ (args.entryid ?'&entry_id=' + args.entryid: ''),'import_mail_'+_elems[0].id,w_h[0],w_h[1]);
}); });
} }
@ -3089,9 +3090,9 @@ app.classes.mail = AppJS.extend(
if (!_entryId) if (!_entryId)
{ {
var buttons = [ var buttons = [
{text: 'Append', id: 'append', image: 'check', default:true}, {text: app.mail.egw.lang('Append'), id: 'append', image: 'check', default:true},
{text: 'Add as new', id: 'new', image: 'check'}, {text: app.mail.egw.lang('Add as new'), id: 'new', image: 'check'},
{text: 'Cancel', id: 'cancel', image: 'check'} {text: app.mail.egw.lang('Cancel'), id: 'cancel', image: 'check'}
]; ];
et2_createWidget("dialog", et2_createWidget("dialog",
{ {
@ -5275,7 +5276,8 @@ app.classes.mail = AppJS.extend(
var mail_import_hook = toolbar.options.actions[integApps[index]]['mail_import']['app_entry_method']; var mail_import_hook = toolbar.options.actions[integApps[index]]['mail_import']['app_entry_method'];
if (integWidget.get_value() == 'on') if (integWidget.get_value() == 'on')
{ {
this.integrate_checkAppEntry(egw.lang('Select %1 entry',integApps[index]), integApps[index].substr(3), subject.get_value(), '', mail_import_hook , function (args){ var title = egw.lang('Select') + ' ' + egw.lang(integApps[index]) + ' ' + (egw.link_get_registry(integApps[index], 'entry') ? egw.link_get_registry(integApps[index], 'entry') : egw.lang('entry'));
this.integrate_checkAppEntry(title, integApps[index].substr(3), subject.get_value(), '', mail_import_hook , function (args){
var value = {}; var value = {};
value[integApps[index]] = args.entryid; value[integApps[index]] = args.entryid;
var oldValue = to_integrate_ids.get_value()[0]; var oldValue = to_integrate_ids.get_value()[0];

1
mail/lang/egw_en.lang
View File

@ -24,6 +24,7 @@ add "%1" into whiltelisted domains mail en Add "%1" into whiltelisted domains
add "%1" into whitelisted emails mail en Add "%1" into whitelisted emails add "%1" into whitelisted emails mail en Add "%1" into whitelisted emails
add a new folder to %1: mail en Add a new Folder to %1: add a new folder to %1: mail en Add a new Folder to %1:
add all my aliases mail en Add all my aliases add all my aliases mail en Add all my aliases
add as new mail en Add as new
add folder mail en Add Folder add folder mail en Add Folder
add to addressbook mail en add to addressbook add to addressbook mail en add to addressbook
add your domain as "%1" in options to list of email providers and enable api. mail en Add your domain as "%1" in options to list of email providers and enable API. add your domain as "%1" in options to list of email providers and enable api. mail en Add your domain as "%1" in options to list of email providers and enable API.