New permission for wiki space #217
+107
−99
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -156,9 +156,9 @@ def update_page(self, title, content, edit_message, raised_by=None): | |||||
| self.save() | ||||||
|
|
||||||
| def verify_permission(self, permtype): | ||||||
| permitted = frappe.has_permission(self.doctype, permtype, self) | ||||||
| if permtype == "read" and self.allow_guest: | ||||||
| return True | ||||||
| if not permitted: | ||||||
| action = permtype | ||||||
| if action == "write": | ||||||
|
|
@@ -216,6 +216,23 @@ def calculate_toc_html(self, html): | |||||
| def get_context(self, context): | ||||||
| self.verify_permission("read") | ||||||
| self.set_breadcrumbs(context) | ||||||
| ccc = frappe.db.sql(""" select user, allow, for_value,name from `tabUser Permission` where user=%s and allow='Wiki Space' """,(frappe.session.user)) | ||||||
|
There was a problem hiding this comment.
Suggested change
Try to use database api and query builder as much as possible instead of raw sql There was a problem hiding this comment. you have to rewrite it everywhere you're using |
||||||
| print(self.name) | ||||||
|
There was a problem hiding this comment. same thing for everywhere you've used print statements |
||||||
| match_found = False | ||||||
| for c in ccc: | ||||||
| ws = frappe.db.sql(""" select w.wiki_page from `tabWiki Group Item` as w where parent=%s""",(c[2])) | ||||||
| for a in ws: | ||||||
| print(a[0]) | ||||||
| if a[0] == self.name: | ||||||
| match_found = True | ||||||
| break | ||||||
| if match_found: | ||||||
| print("ok") | ||||||
| else: | ||||||
| frappe.local.response["type"] = "redirect" | ||||||
| frappe.local.response["location"] = "/" | ||||||
| raise frappe.Redirect | ||||||
| print("++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++") | ||||||
| wiki_settings = frappe.get_single("Wiki Settings") | ||||||
| context.navbar_search = wiki_settings.add_search_bar | ||||||
| context.add_dark_mode = wiki_settings.add_dark_mode | ||||||
|
|
@@ -283,6 +300,7 @@ def get_context(self, context): | |||||
|
|
||||||
| def get_items(self, sidebar_items): | ||||||
| topmost = frappe.get_value("Wiki Group Item", {"wiki_page": self.name}, ["parent"]) | ||||||
| wikiSpace = frappe.db.sql("""select name from `tabWiki Space`""") | ||||||
|
There was a problem hiding this comment. Like I said please don't use raw sql unless absolutely necessary. Also try to use snake case for variables. ie |
||||||
|
|
||||||
| sidebar_html = frappe.cache().hget("wiki_sidebar", topmost) | ||||||
| if not sidebar_html or frappe.conf.disable_website_cache or frappe.conf.developer_mode: | ||||||
|
|
@@ -294,6 +312,7 @@ def get_items(self, sidebar_items): | |||||
| context.current_route = self.route | ||||||
| context.collapse_sidebar_groups = wiki_settings.collapse_sidebar_groups | ||||||
| context.sidebar_items = sidebar_items | ||||||
| context.wikiSpace = wikiSpace | ||||||
| context.wiki_search_scope = self.get_space_route() | ||||||
| sidebar_html = frappe.render_template( | ||||||
| "wiki/wiki/doctype/wiki_page/templates/web_sidebar.html", context | ||||||
|
|
@@ -304,30 +323,36 @@ def get_items(self, sidebar_items): | |||||
|
|
||||||
| def get_sidebar_items(self): | ||||||
| wiki_sidebar = frappe.get_doc("Wiki Space", {"route": self.get_space_route()}).wiki_sidebars | ||||||
| check = frappe.db.sql(""" select user, allow, for_value,name from `tabUser Permission` where user=%s and allow='Wiki Space' """,(frappe.session.user)) | ||||||
| print("==================================================================") | ||||||
| sidebar = {} | ||||||
|
|
||||||
| for sidebar_item in wiki_sidebar: | ||||||
| for c in check: | ||||||
| if c and c[2] and c[2] == sidebar_item.parent: | ||||||
| wiki_page = frappe.get_doc("Wiki Page", sidebar_item.wiki_page) | ||||||
| if sidebar_item.parent_label not in sidebar: | ||||||
| sidebar[sidebar_item.parent_label] = [ | ||||||
| { | ||||||
| "name": wiki_page.name, | ||||||
| "type": "Wiki Page", | ||||||
| "title": wiki_page.title, | ||||||
| "route": wiki_page.route, | ||||||
| "group_name": sidebar_item.parent_label, | ||||||
| } | ||||||
| ] | ||||||
| else: | ||||||
| sidebar[sidebar_item.parent_label] += [ | ||||||
| { | ||||||
| "name": wiki_page.name, | ||||||
| "type": "Wiki Page", | ||||||
| "title": wiki_page.title, | ||||||
| "route": wiki_page.route, | ||||||
| "group_name": sidebar_item.parent_label, | ||||||
| } | ||||||
| ] | ||||||
| else: | ||||||
| print("_________________________________________________") | ||||||
|
|
||||||
| return self.get_items(sidebar) | ||||||
|
|
||||||
|
|
||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change may represent a potential performance regression for no obvious reason.
has_permissionis not the cheapest of methods to run on anonymous requests.