From 913a0095d0c502738c7c1fca51267c7828d2a303 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Fri, 7 Dec 2018 11:18:06 +0100 Subject: [PATCH] * Mail: Move modify subject action from list view into preview --- mail/js/app.js | 3 +++ mail/templates/default/index.xet | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mail/js/app.js b/mail/js/app.js index 51c13f7ed1..b2c4c042c2 100644 --- a/mail/js/app.js +++ b/mail/js/app.js @@ -6126,6 +6126,7 @@ app.classes.mail = AppJS.extend( */ modifyMessageSubjectDialog: function (_action, _sender) { + _sender = _sender ? _sender : [{id:this.mail_currentlyFocussed}]; var id = (_sender && _sender.uid) ? _sender.row_id: _sender[0].id != 'nm'? _sender[0].id:_sender[1].id; var data = (_sender && _sender.uid) ? {data:_sender} : egw.dataGetUIDdata(id); @@ -6147,7 +6148,9 @@ app.classes.mail = AppJS.extend( switch (_button_id) { case "save": + egw.loading_prompt('modifyMessageSubjectDialog', true); egw.json('mail.mail_ui.ajax_saveModifiedMessageSubject',[id, newSubject], function(_data){ + egw.loading_prompt('modifyMessageSubjectDialog', false); if (_data && !_data.success) { egw.message(_data.msg, "error"); diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet index 2c03d8fbcf..16f74ac304 100644 --- a/mail/templates/default/index.xet +++ b/mail/templates/default/index.xet @@ -17,7 +17,7 @@ - + @@ -111,7 +111,7 @@ - +