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

fix: Minor fixes

Browse source
This commit is contained in:
Faris Ansari 2019-06-21 12:59:49 +05:30
parent 11e6782e37
commit d3ad4f4750
5 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frappe/public/js/frappe/web_form/web_form_list.js
View file

@ -299,8 +299,9 @@ frappe.ui.WebFormListRow = class WebFormListRow {
this.columns.forEach(field => {
let cell = this.row.insertCell();
let formatter = frappe.form.get_formatter(field.fieldtype)
cell.innerHTML = this.doc[field.fieldname] && formatter(this.doc[field.fieldname]) || "";
let formatter = frappe.form.get_formatter(field.fieldtype);
cell.innerHTML = this.doc[field.fieldname] &&
formatter(this.doc[field.fieldname], field, {only_value: 1}, this.doc) || "";
});
this.row.onclick = () => this.events.onEdit();

2
frappe/public/js/frappe/web_form/webform_script.js
View file

@ -46,7 +46,7 @@ frappe.ready(function() {
let web_form = new frappe.ui.WebForm({
parent: wrapper,
fields: data.web_form.web_form_fields,
doc: res.message.doc,
doc: res.message.doc || {},
...data.web_form,
});

12
frappe/public/scss/website.scss
View file

@ -127,8 +127,16 @@ h4.modal-title {
@extend .d-sm-none;
}
.form-section {
margin-right: -45px;
}
.form-section .section-body {
width:100%;
width: 100%;
padding: 15px;
@extend .row;
}
}
.pull-right {
float: right;
}

2
frappe/website/doctype/web_form/templates/web_form.html
View file

@ -14,7 +14,7 @@
{% endblock %}
{% block header_actions %}
<div class="web-form-actions" style="display: block; margin-right: 30px;">
<div class="web-form-actions" style="display: block;">
</div>
<div class="list-view-actions"></div>
{% endblock %}

2
frappe/website/doctype/web_form/web_form.py
View file

@ -572,7 +572,7 @@ def get_in_list_view_fields(doctype):
def get_field_df(fieldname):
if fieldname == 'name':
return { 'fieldname': 'name', 'fieldtype': 'Data' }
return { 'label': 'Name', 'fieldname': 'name', 'fieldtype': 'Data' }
return meta.get_field(fieldname).as_dict()
return [get_field_df(f) for f in fields]