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

Allow developers to choose attachments (#4477)

Browse source 
* Allow developers to choose attachments

This change allows developers to choose attachments, even if there is a cur_frm object.

* Update communication.js

* Merge this.attachments and form attachments

* fix codacy
This commit is contained in:
ci2014 2017-12-06 15:32:13 +01:00 • committed by Faris Ansari
parent 694ab62d4b
commit 01a955eb45
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -354,11 +354,14 @@ frappe.views.CommunicationComposer = Class.extend({
var fields = this.dialog.fields_dict;
var attach = $(fields.select_attachments.wrapper).find(".attach-list").empty();
if (cur_frm){
var files = cur_frm.get_files();
}else {
var files = this.attachments
var files = [];
if (this.attachments && this.attachments.length) {
files = files.concat(this.attachments);
}
if (cur_frm) {
files = files.concat(cur_frm.get_files());
}
if(files.length) {
$.each(files, function(i, f) {
if (!f.file_name) return;