浏览代码

compress_doclist legacy alias in sync.js; removed rename_dt exception in wnf.py

version-14
Anand Doshi 12 年前
父节点
当前提交
7af7929f38
共有 2 个文件被更改,包括 11 次插入10 次删除
  1. +4
    -1
      public/js/wn/model/sync.js
  2. +7
    -9
      wnf.py

+ 4
- 1
public/js/wn/model/sync.js 查看文件

@@ -114,4 +114,7 @@ $.extend(wn.model, {


return JSON.stringify({'_vl':values, '_kl':keys}); return JSON.stringify({'_vl':values, '_kl':keys});
} }
});
});

// legacy
compress_doclist = wn.model.compress;

+ 7
- 9
wnf.py 查看文件

@@ -35,15 +35,13 @@ def replace_code(start, txt1, txt2, extn, search=None, force=False):
for fn in wt[2]: for fn in wt[2]:
if fn.split('.')[-1]==extn: if fn.split('.')[-1]==extn:
fpath = os.path.join(wt[0], fn) fpath = os.path.join(wt[0], fn)
if fpath != '/var/www/erpnext/erpnext/patches/jan_mar_2012/rename_dt.py': # temporary
with open(fpath, 'r') as f:
content = f.read()
if re.search(search, content):
res = search_replace_with_prompt(fpath, txt1, txt2, force)
if res == 'skip':
return 'skip'

with open(fpath, 'r') as f:
content = f.read()
if re.search(search, content):
res = search_replace_with_prompt(fpath, txt1, txt2, force)
if res == 'skip':
return 'skip'




def search_replace_with_prompt(fpath, txt1, txt2, force=False): def search_replace_with_prompt(fpath, txt1, txt2, force=False):


正在加载...
取消
保存