vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #553 from rmehta/develop

Browse source 
save communication if lost
This commit is contained in:
Pratik Vyas 2014-05-22 19:03:41 +05:30
commit 9fe4e17bb0
2 changed files with 34 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frappe/public/js/frappe/request.js
View file

@ -62,11 +62,15 @@ frappe.request.call = function(opts) {
},
417: function(data, xhr) {
if(typeof data === "string") data = JSON.parse(data);
opts.error && opts.error(data, xhr.responseText)
opts.error && opts.error(data, xhr.responseText);
},
501: function(data, xhr) {
if(typeof data === "string") data = JSON.parse(data);
opts.error && opts.error(data, xhr.responseText)
opts.error && opts.error(data, xhr.responseText);
},
500: function() {
msgprint(__("Server Error: Please check your server logs or contact tech support."))
opts.error && opts.error();
}
},
async: opts.async

29
frappe/public/js/frappe/views/communication.js
View file

@ -127,11 +127,12 @@ frappe.views.CommunicationList = Class.extend({
}
});
frappe.last_edited_communication = {};
frappe.views.CommunicationComposer = Class.extend({
init: function(opts) {
$.extend(this, opts)
this.make();
this.dialog.show();
},
make: function() {
var me = this;
@ -190,16 +191,41 @@ frappe.views.CommunicationComposer = Class.extend({
}
})
this.prepare();
this.dialog.show();
},
prepare: function() {
this.setup_print();
this.setup_attach();
this.setup_email();
this.setup_autosuggest();
this.setup_last_edited_communication();
$(this.dialog.fields_dict.recipients.input).val(this.recipients || "").change();
$(this.dialog.fields_dict.subject.input).val(this.subject || "").change();
this.setup_earlier_reply();
},
setup_last_edited_communication: function() {
var me = this;
this.dialog.onhide = function() {
if(cur_frm) {
frappe.last_edited_communication[cur_frm.doctype] = {
recipients: me.dialog.get_value("recipients"),
subject: me.dialog.get_value("subject"),
content: me.dialog.get_value("content"),
}
}
}
this.dialog.onshow = function() {
if(frappe.last_edited_communication[cur_frm.doctype]) {
c = frappe.last_edited_communication[cur_frm.doctype];
me.dialog.set_value("subject", c.subject || "");
me.dialog.set_value("recipients", c.recipients || "");
me.dialog.set_value("content", c.content || "");
}
}
},
setup_print: function() {
// print formats
var fields = this.dialog.fields_dict;
@ -316,6 +342,7 @@ frappe.views.CommunicationComposer = Class.extend({
if(form_values.send_email)
msgprint(__("Email sent to {0}", [form_values.recipients]));
me.dialog.hide();
frappe.last_edited_communication[cur_frm.doctype] = null;
cur_frm.reload_doc();
} else {
msgprint(__("There were errors while sending email. Please try again."));