瀏覽代碼

[fix] allow path attachements to be sent my email (#2138)

version-14
RobertSchouten 8 年之前
committed by Rushabh Mehta
父節點
當前提交
3730e4fa8f
共有 2 個檔案被更改,包括 6 行新增4 行删除
  1. +2
    -1
      frappe/public/js/frappe/form/footer/attachments.js
  2. +4
    -3
      frappe/utils/file_manager.py

+ 2
- 1
frappe/public/js/frappe/form/footer/attachments.js 查看文件

@@ -228,13 +228,14 @@ frappe.ui.get_upload_dialog = function(opts){
'method': 'frappe.client.get_value',
'args': {
'doctype': 'File',
'fieldname': 'file_url',
'fieldname': ['file_url','filename'],
'filters': {
'name': dialog.get_value("file")
}
},
callback: function(r){
dialog.$wrapper.find('[name="file_url"]').val(r.message.file_url);
opts.args.filename = r.message.file_name
}
});
});


+ 4
- 3
frappe/utils/file_manager.py 查看文件

@@ -32,10 +32,10 @@ def upload():
raise_exception=True)

# save
if filename:
if frappe.form_dict.filedata:
filedata = save_uploaded(dt, dn, folder, is_private)
elif file_url:
filedata = save_url(file_url, dt, dn, folder)
filedata = save_url(file_url, filename, dt, dn, folder)

comment = {}
if dt and dn:
@@ -60,7 +60,7 @@ def save_uploaded(dt, dn, folder, is_private):
else:
raise Exception

def save_url(file_url, dt, dn, folder):
def save_url(file_url, filename, dt, dn, folder):
# if not (file_url.startswith("http://") or file_url.startswith("https://")):
# frappe.msgprint("URL must start with 'http://' or 'https://'")
# return None, None
@@ -70,6 +70,7 @@ def save_url(file_url, dt, dn, folder):
f = frappe.get_doc({
"doctype": "File",
"file_url": file_url,
"fieldname": filename,
"attached_to_doctype": dt,
"attached_to_name": dn,
"folder": folder


Loading…
取消
儲存