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

Merge branch 'master' into edge

Browse source
This commit is contained in:
Anand Doshi 2013-03-30 22:10:45 +05:30
commit 003aeef5e7
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/page/data_import_tool/data_import_tool.py
View file

@ -8,7 +8,7 @@ from webnotes.utils import cstr, cint, flt
from webnotes.utils.datautils import UnicodeWriter
data_keys = webnotes._dict({
"data_separator": '----Start entering data below this line----',
"data_separator": '::: Start entering data below this line :::',
"main_table": "Table:",
"parent_table": "Parent Table:",
"columns": "Column Name:"
@ -68,7 +68,7 @@ def get_template():
else:
w.writerow([''])
w.writerow(['----'])
w.writerow([':::'])
w.writerow(['Notes:'])
w.writerow(['Please do not change the template headings.'])
w.writerow(['First data column must be blank.'])
@ -80,7 +80,7 @@ def get_template():
if key == "parent":
w.writerow(['"Parent" signifies the parent table in which this row must be added'])
w.writerow(['If you are updating, please select "Overwrite" else existing rows will not be deleted.'])
w.writerow(['----'])
w.writerow([':::'])
labelrow = ["Column Labels", "ID"]
fieldrow = [data_keys.columns, key]
mandatoryrow = ['Mandatory:', 'Yes']

2
public/js/wn/views/listview.js
View file

@ -123,7 +123,7 @@ wn.views.ListView = Class.extend({
// make table
$.each(this.columns, function(i, v) {
if(v.content && v.content.substr && v.content.substr(0,6)=="avatar") {
rowhtml += repl('<td style="width: 40px;"></td>');
rowhtml += repl('<td style="max-width: 40px;"></td>');
} else {
rowhtml += repl('<td style="width: %(width)s"></td>', v);
}