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

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

Browse source
This commit is contained in:
Rushabh Mehta 2013-04-15 10:54:13 +05:30
commit a5fd8fd53a
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
public/js/legacy/utils/datatype.js
View file

@ -148,12 +148,12 @@ function replace_all(s, t1, t2) {
function keys(obj) {
var mykeys=[];
for (key in obj) mykeys[mykeys.length]=key;
for (var key in obj) mykeys[mykeys.length]=key;
return mykeys;
}
function values(obj) {
var myvalues=[];
for (key in obj) myvalues[myvalues.length]=obj[key];
for (var key in obj) myvalues[myvalues.length]=obj[key];
return myvalues;
}

2
public/js/legacy/widgets/form/clientscriptAPI.js
View file

@ -219,7 +219,7 @@ _f.Frm.prototype.call_server = function(method, args, callback) {
}
_f.Frm.prototype.get_files = function() {
return cur_frm.attachments.get_file_list().keys().sort();
return keys(cur_frm.attachments.get_file_list()).sort();
}
_f.Frm.prototype.set_query = function(fieldname, opt1, opt2) {

2
webnotes/utils/file_manager.py
View file

@ -98,7 +98,7 @@ def save_file(fname, content, dt, dn):
os.remove(temp_fname)
else:
# get_new_version name
fname = get_new_fname_based_on_version(file_path, fname)
fname = get_new_fname_based_on_version(files_path, fname)
# rename
os.rename(temp_fname, os.path.join(files_path, fname))