From d3ad4f4750a4e0d00940b7e679539ea5087f6a88 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Fri, 21 Jun 2019 12:59:49 +0530
Subject: [PATCH] fix: Minor fixes

---
 frappe/public/js/frappe/web_form/web_form_list.js    |  5 +++--
 frappe/public/js/frappe/web_form/webform_script.js   |  2 +-
 frappe/public/scss/website.scss                      | 12 ++++++++++--
 .../website/doctype/web_form/templates/web_form.html |  2 +-
 frappe/website/doctype/web_form/web_form.py          |  2 +-
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/frappe/public/js/frappe/web_form/web_form_list.js b/frappe/public/js/frappe/web_form/web_form_list.js
index 77dc0dab12..f3ea794c02 100644
--- a/frappe/public/js/frappe/web_form/web_form_list.js
+++ b/frappe/public/js/frappe/web_form/web_form_list.js
@@ -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();
diff --git a/frappe/public/js/frappe/web_form/webform_script.js b/frappe/public/js/frappe/web_form/webform_script.js
index fe908d6c72..d4721ccb57 100644
--- a/frappe/public/js/frappe/web_form/webform_script.js
+++ b/frappe/public/js/frappe/web_form/webform_script.js
@@ -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,
 			});
 
diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss
index 0a147d4cf0..0aa2f97e59 100644
--- a/frappe/public/scss/website.scss
+++ b/frappe/public/scss/website.scss
@@ -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;
-}
\ No newline at end of file
+}
+
+.pull-right {
+	float: right;
+}
diff --git a/frappe/website/doctype/web_form/templates/web_form.html b/frappe/website/doctype/web_form/templates/web_form.html
index 6a0fcab5d7..2732963272 100644
--- a/frappe/website/doctype/web_form/templates/web_form.html
+++ b/frappe/website/doctype/web_form/templates/web_form.html
@@ -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 %}
diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py
index a712dc4105..05e395163f 100644
--- a/frappe/website/doctype/web_form/web_form.py
+++ b/frappe/website/doctype/web_form/web_form.py
@@ -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]