From 89f4deba8ee6ea3407faa426985290d0feabd6df Mon Sep 17 00:00:00 2001
From: Hadi Nategh
Date: Mon, 26 Feb 2018 17:53:59 +0100
Subject: [PATCH] Use hover_action to edit subject of a message
---
mail/js/app.js | 11 ++++++-----
mail/templates/default/index.xet | 2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/mail/js/app.js b/mail/js/app.js
index 548572abad..aecde4a4e8 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -6039,13 +6039,14 @@ app.classes.mail = AppJS.extend(
/**
* Creates a dialog for changing meesage subject
*
- * @param {type} _action
- * @param {type} _sender
+ * @param {object} _action|_widget
+ * @param {object} _sender|_content
*/
modifyMessageSubjectDialog: function (_action, _sender)
{
- var id = _sender[0].id != 'nm'? _sender[0].id:_sender[1].id;
- var data = egw.dataGetUIDdata(id);
+ 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);
var subject = data && data.data? data.data.subject : "";
var buttons = [
@@ -6064,7 +6065,7 @@ app.classes.mail = AppJS.extend(
switch (_button_id)
{
case "save":
- egw.json('mail.mail_ui.ajax_saveModifiedMessageSubject',[_sender[0].id, newSubject], function(_data){
+ egw.json('mail.mail_ui.ajax_saveModifiedMessageSubject',[id, newSubject], function(_data){
if (_data && !_data.success)
{
egw.message(_data.msg, "error");
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index 74922ea872..88d8b3964a 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -111,7 +111,7 @@
-
+