Skip to content

Commit

Permalink
fix: allow custom html block based on roles applied
Browse files Browse the repository at this point in the history
if roles table is empty it will allow access
  • Loading branch information
shariquerik committed May 17, 2023
1 parent b8c6791 commit d08b0fa
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 2 deletions.
21 changes: 21 additions & 0 deletions frappe/desk/desktop.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,24 @@ def _prepare_item(self, item):

return item

def is_custom_block_permitted(self, custom_block_name):
from frappe.utils import has_common

allowed = [
d.role
for d in frappe.get_all("Has Role", fields=["role"], filters={"parent": custom_block_name})
]

if not allowed:
return True

roles = frappe.get_roles()

if has_common(roles, allowed):
return True

return False

@handle_not_exist
def get_links(self):
cards = self.doc.get_link_groups()
Expand Down Expand Up @@ -355,6 +373,9 @@ def get_custom_blocks(self):

for custom_block in custom_blocks:
if frappe.has_permission("Custom HTML Block", doc=custom_block.custom_block_name):
if not self.is_custom_block_permitted(custom_block.custom_block_name):
continue

# Translate label
custom_block.label = (
_(custom_block.label) if custom_block.label else _(custom_block.custom_block_name)
Expand Down
17 changes: 15 additions & 2 deletions frappe/desk/doctype/custom_html_block/custom_html_block.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
"js_message",
"script",
"css_section",
"style"
"style",
"roles_section",
"roles"
],
"fields": [
{
Expand Down Expand Up @@ -74,11 +76,22 @@
"fieldtype": "HTML",
"label": "HTML Message",
"options": "<p>You cannot use global class on elements. The css for those classes will not be applied on this HTML, you will have to rewrite styles again in CSS field</p><p>For Example:</p>\n<pre class=\"p-3 bg-gray-100 border-radius rounded-sm mb-0\" style=\"width: fit-content;\"><code>// style for class m-3 will not work\n<br>&lt;div class=\"m-3\"&gt;&lt;/div&gt;<br>\n<br>// You will have to add style of m-3 in CSS field below like\n<br>.m-3 {\n<br> margin: 14px!important\n<br>}\n</code></pre>"
},
{
"fieldname": "roles_section",
"fieldtype": "Section Break",
"label": "Roles"
},
{
"fieldname": "roles",
"fieldtype": "Table",
"label": "Roles",
"options": "Has Role"
}
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2023-05-17 16:51:32.449635",
"modified": "2023-05-17 17:17:04.232519",
"modified_by": "Administrator",
"module": "Desk",
"name": "Custom HTML Block",
Expand Down

0 comments on commit d08b0fa

Please sign in to comment.