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

Merge branch 'latest' of github.com:webnotes/wnframework into latest

Browse source
This commit is contained in:
Anand Doshi 2012-02-16 16:13:56 +05:30
commit f5d4e0f8a9
3 changed files with 18 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
js/legacy/utils/dom.js
View file

@ -465,9 +465,7 @@ wn.urllib = {
// a file upload / attachment
// by file id / name
get_file_url: function(file_id) {
//var url = wn.urllib.get_base_url();
var ac_id = wn.control_panel.account_id;
return repl('cgi-bin/getfile.cgi?name=%(fn)s&acx=%(ac)s', {fn:file_id, ac:ac_id})
return repl('files/%(fn)s', {fn:file_id, ac:ac_id})
}
}

5
js/legacy/wn/widgets/form/attachments.js
View file

@ -89,7 +89,10 @@ wn.widgets.form.sidebar.Attachment = function(parent, filedet, frm) {
}
// download
this.ln = $a(this.wrapper, 'a', 'link_type', {fontSize:'11px'}, this.fileid);
var display_name = this.fileid;
if(this.fileid.substr(0,8)=='FileData')
display_name = this.filename;
this.ln = $a(this.wrapper, 'a', 'link_type', {fontSize:'11px'}, display_name);
this.ln.href = 'files/'+this.fileid;
this.ln.target = '_blank';

33
py/webnotes/utils/file_manager.py
View file

@ -196,7 +196,8 @@ def write_file(fid, content):
# -------------------------------------------------------
def get_file_system_name(fname):
# get system name from File Data table
return webnotes.conn.sql("select name, file_name from `tabFile Data` where name=%s or file_name=%s", (fname, fname))
return webnotes.conn.sql("""select name, file_name from `tabFile Data`
where name=%s or file_name=%s""", (fname, fname))
# -------------------------------------------------------
def delete_file(fname, verbose=0):
@ -219,29 +220,21 @@ def delete_file(fname, verbose=0):
# -------------------------------------------------------
def get_file(fname):
in_fname = fname
# from the "File" table
if webnotes.conn.exists('File',fname):
fname = webnotes.conn.sql("select file_list from tabFile where name=%s", fname)
fname = fname and fname[0][0]
fname = fname.split('\n')[0].split(',')[1]
if get_file_system_name(fname):
f = get_file_system_name(fname)[0]
"""deprecated"""
f = get_file_system_name(fname)
if f:
file_id = f[0][0].replace('/','-')
file_name = f[0][1]
else:
f = None
file_id = fname
file_name = fname
# read the file
import os
file_id = f[0].replace('/','-')
file = open(os.path.join(webnotes.get_files_path(), file_id), 'r')
content = file.read()
file.close()
return [f[1], content]
with open(os.path.join(webnotes.get_files_path(), file_id), 'r') as f:
content = f.read()
return [file_name, content]
# Conversion Patch
# -------------------------------------------------------