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

Merge pull request #808 from anandpdoshi/anand-september-1

Browse source 
style_settings.css: page_header_color, frappe.perm.is_visible
This commit is contained in:
Rushabh Mehta 2014-09-01 12:50:54 +05:30
commit 26fad43f0b
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
frappe/public/js/frappe/model/perm.js
View file

@ -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;
},
});

2
frappe/templates/pages/style_settings.py
View file

@ -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"