From 62116b611da63612d06ed3310f6395466894276a Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 1 Sep 2014 11:30:33 +0530 Subject: [PATCH 1/2] [minor] style_settings.css: page_header_color --- frappe/templates/pages/style_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/templates/pages/style_settings.py b/frappe/templates/pages/style_settings.py index 90a1b2aa19..afc48a3d01 100644 --- a/frappe/templates/pages/style_settings.py +++ b/frappe/templates/pages/style_settings.py @@ -13,7 +13,7 @@ default_properties = { "top_bar_foreground": "000000", "page_text": "000000", "page_header_background": "263248", - "page_header_text": "ffffff", + "page_header_color": "ffffff", "font_size": "14px", "google_web_font_for_heading": "Noto Sans", "google_web_font_for_text": "Noto Sans" From dcae75e710f3ee60ad61d633a86268a6e3477030 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 1 Sep 2014 12:33:15 +0530 Subject: [PATCH 2/2] [minor] frappe.perm.is_visible, returns true if visible based on permlevel --- frappe/public/js/frappe/model/perm.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/frappe/public/js/frappe/model/perm.js b/frappe/public/js/frappe/model/perm.js index 0712dc2ea2..a723074f54 100644 --- a/frappe/public/js/frappe/model/perm.js +++ b/frappe/public/js/frappe/model/perm.js @@ -251,4 +251,15 @@ $.extend(frappe.perm, { return status; }, + + is_visible: function(df, doc, perm) { + if (typeof df === 'string') { + // df is fieldname + df = frappe.meta.get_docfield(doc.doctype, df, doc.parent || doc.name); + } + + var status = frappe.perm.get_field_display_status(df, doc, perm); + + return status==="None" ? false : true; + }, });