From 572ed956a3348cf1ec9ea3dcfb02d656ba08f81c Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Thu, 12 Feb 2015 20:03:18 +0530
Subject: [PATCH] [fix] hide fields if reqd when field not in form, clickable
 Attach Image

---
 frappe/public/css/form.css              |  4 ++++
 frappe/public/js/frappe/form/control.js | 24 ++++++++++++++----------
 frappe/public/js/frappe/model/perm.js   |  4 +++-
 frappe/public/less/form.less            |  4 ++++
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/frappe/public/css/form.css b/frappe/public/css/form.css
index ae34d33a5f..e69253cecc 100644
--- a/frappe/public/css/form.css
+++ b/frappe/public/css/form.css
@@ -124,3 +124,7 @@
 .linked-with-dialog .form-section {
   padding-top: 15px;
 }
+.attach-missing-image,
+.attach-image-display {
+  cursor: pointer;
+}
diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js
index a1845fd1d5..ecd4380325 100644
--- a/frappe/public/js/frappe/form/control.js
+++ b/frappe/public/js/frappe/form/control.js
@@ -41,14 +41,12 @@ frappe.ui.form.Control = Class.extend({
 	// returns "Read", "Write" or "None"
 	// as strings based on permissions
 	get_status: function(explain) {
-		if(!this.doctype)
-			return "Write";
-
 		var status = frappe.perm.get_field_display_status(this.df,
-			locals[this.doctype][this.docname], this.perm || this.frm.perm, explain);
+			frappe.model.get_doc(this.doctype, this.docname), this.perm || (this.frm && this.frm.perm), explain);
 
 		// hide if no value
-		if (status==="Read" && is_null(frappe.model.get_value(this.doctype, this.docname, this.df.fieldname))) {
+		if (this.doctype && status==="Read"
+			&& is_null(frappe.model.get_value(this.doctype, this.docname, this.df.fieldname))) {
 			status = "None";
 		}
 
@@ -620,7 +618,7 @@ frappe.ui.form.ControlButton = frappe.ui.form.ControlData.extend({
 frappe.ui.form.ControlAttach = frappe.ui.form.ControlData.extend({
 	make_input: function() {
 		var me = this;
-		this.$input = $('<button class="btn btn-default btn-sm">')
+		this.$input = $('<button class="btn btn-default btn-sm btn-attach">')
 			.html(__("Attach"))
 			.prependTo(me.input_area)
 			.on("click", function() {
@@ -744,12 +742,18 @@ frappe.ui.form.ControlAttach = frappe.ui.form.ControlData.extend({
 
 frappe.ui.form.ControlAttachImage = frappe.ui.form.ControlAttach.extend({
 	make_input: function() {
+		var me = this;
 		this._super();
-		this.img = $("<img class='img-responsive attach-image-display'>").appendTo($('<div style="margin: 7px 0px;">\
-			<div class="missing-image"><i class="octicon octicon-circle-slash"></i></div></div>')
-			.prependTo(this.input_area)).toggle(false);
+		this.img_wrapper = $('<div style="margin: 7px 0px;">\
+			<div class="missing-image attach-missing-image"><i class="octicon octicon-circle-slash"></i></div></div>')
+			.prependTo(this.input_area);
+		this.img = $("<img class='img-responsive attach-image-display'>")
+			.appendTo(this.img_wrapper).toggle(false);
+
+		// propagate click to Attach button
+		this.img_wrapper.find(".missing-image").on("click", function() { me.$input.click(); });
+		this.img.on("click", function() { me.$input.click(); });
 
-		var me = this;
 		this.$wrapper.on("refresh", function() {
 			if(me.get_value()) {
 				$(me.input_area).find(".missing-image").toggle(false);
diff --git a/frappe/public/js/frappe/model/perm.js b/frappe/public/js/frappe/model/perm.js
index 99d2bb74d2..fda31c187d 100644
--- a/frappe/public/js/frappe/model/perm.js
+++ b/frappe/public/js/frappe/model/perm.js
@@ -190,7 +190,9 @@ $.extend(frappe.perm, {
 	},
 
 	get_field_display_status: function(df, doc, perm, explain) {
-		if(!doc) return "Write";
+		if(!doc) {
+			return (df && cint(df.hidden)) ? "None": "Write";
+		}
 
 		perm = perm || frappe.perm.get_perm(doc.doctype, doc);
 		if(!df.permlevel) df.permlevel = 0;
diff --git a/frappe/public/less/form.less b/frappe/public/less/form.less
index 900cf61af1..eddfb0bf62 100644
--- a/frappe/public/less/form.less
+++ b/frappe/public/less/form.less
@@ -161,3 +161,7 @@
 	}
 }
 
+.attach-missing-image,
+.attach-image-display {
+	cursor: pointer;
+}