'
@@ -30,48 +30,48 @@ def get_context(context):
"content": '
'
'You are not permitted to view this page.
'
}
-
+
def get_group_context(group, view, context):
cache_key = "website_group_context:{}:{}".format(group, view)
views = get_views(context.doc.group_type)
view = frappe._dict(views.get(view))
-
+
if can_cache(view.no_cache):
group_context = frappe.cache().get_value(cache_key)
if group_context:
return group_context
-
+
group_context = build_group_context(group, view, views, context)
-
+
if can_cache(view.get("no_cache")):
frappe.cache().set_value(cache_key, group_context)
-
+
return group_context
-
+
def build_group_context(group, view, views, context):
title = "{} - {}".format(context.doc.group_title, view.get("label"))
-
+
group_context = frappe._dict({
- "group": context.doc.as_dict(),
+ "group": context.doc,
"view": view,
"views": [v[1] for v in sorted(views.iteritems(), key=lambda (k, v): v.get("idx"))],
"title": title,
"pathname": context.pathname
})
group_context.update(build_view_context(group_context))
-
+
return group_context
-
+
def build_view_context(context):
from frappe.templates.website_group.post import get_post_context
-
+
if context.view.name in ("popular", "feed", "open", "closed", "upcoming", "past"):
context.post_list_html = get_post_list_html(context.group.name, context.view.name)
-
+
elif context.view.name == "edit":
context.post = frappe.get_doc("Post", frappe.form_dict.name).as_dict()
-
+
if context.post.assigned_to:
context.user = frappe.get_doc("User", context.post.assigned_to)
@@ -79,22 +79,22 @@ def build_view_context(context):
context.users = frappe.db.sql("""select p.*, wsp.`read`, wsp.`write`, wsp.`admin`
from `tabUser` p, `tabWebsite Route Permission` wsp
where wsp.website_route=%s and wsp.user=p.name""", context.pathname, as_dict=True)
-
+
elif context.view.name == "post":
context.update(get_post_context(context))
-
+
return context
-
+
def guess_group_view(context):
group = context.docname
view = frappe.form_dict.view or get_default_view(context.doc.group_type)
return group, view
-
+
def get_default_view(group_type):
for view, opts in get_views(group_type).iteritems():
if opts.get("default"):
return view
-
+
def get_views(group_type=None):
if group_type:
group_views = frappe._dict(views[group_type])
@@ -102,22 +102,22 @@ def get_views(group_type=None):
group_views = {}
for group_type in views:
group_views.update(views[group_type].copy())
-
+
group_views.update(common_views)
-
+
if group_type == "Forum":
group_views["post"]["upvote"] = True
-
+
return group_views
-
-def has_access(access, view):
+
+def has_access(access, view):
if view=="settings":
return access.get("admin")
elif view in ("add", "edit"):
return access.get("write")
else:
return access.get("read")
-
+
def clear_cache(path=None, website_group=None):
from frappe.templates.website_group.post import clear_post_cache
if path:
@@ -127,7 +127,7 @@ def clear_cache(path=None, website_group=None):
else:
clear_post_cache()
website_groups = frappe.db.sql_list("""select name from `tabWebsite Group`""")
-
+
cache = frappe.cache()
all_views = get_views()
for group in website_groups:
@@ -137,10 +137,10 @@ def clear_cache(path=None, website_group=None):
def clear_event_cache():
for group in frappe.db.sql_list("""select name from `tabWebsite Group` where group_type='Event'"""):
clear_unit_views(website_group=group)
-
+
def clear_cache_on_doc_event(doc, method, *args, **kwargs):
clear_cache(path=doc.website_route, website_group=doc.website_group)
-
+
def get_pathname(group):
return frappe.db.get_value("Website Route", {"ref_doctype": "Website Group",
"docname": group})
@@ -237,4 +237,4 @@ common_views = {
"hidden": True,
"idx": 6
}
-}
\ No newline at end of file
+}
diff --git a/frappe/templates/website_group/post.py b/frappe/templates/website_group/post.py
index da450a715e..ebdc15283d 100644
--- a/frappe/templates/website_group/post.py
+++ b/frappe/templates/website_group/post.py
@@ -12,7 +12,7 @@ def get_post_context(context):
post = frappe.get_doc("Post", frappe.form_dict.name)
if post.parent_post:
raise frappe.PermissionError
-
+
def _get_post_context():
fullname = get_fullname(post.owner)
return {
@@ -21,42 +21,42 @@ def get_post_context(context):
"post_list_html": get_child_posts_html(post, context),
"parent_post": post.name
}
-
+
cache_key = "website_group_post:{}".format(post.name)
return frappe.cache().get_value(cache_key, lambda: _get_post_context())
-
+
def get_parent_post_html(post, context):
user = frappe.get_doc("User", post.owner)
for fieldname in ("first_name", "last_name", "user_image", "location"):
post.set(fieldname, user.get(fieldname))
-
+
return frappe.get_template("templates/includes/inline_post.html")\
- .render({"post": post.as_dict(), "view": context.view})
+ .render({"post": post, "view": context.view})
def get_child_posts_html(post, context):
posts = frappe.db.sql("""select p.*, pr.user_image, pr.first_name, pr.last_name
from tabPost p, tabUser pr
where p.parent_post=%s and pr.name = p.owner
order by p.creation asc""", (post.name,), as_dict=True)
-
+
return frappe.get_template("templates/includes/post_list.html")\
.render({
"posts": posts,
"parent_post": post.name,
"view": context.view
})
-
+
def clear_post_cache(post=None):
cache = frappe.cache()
posts = [post] if post else frappe.db.sql_list("select name from `tabPost`")
for post in posts:
cache.delete_value("website_group_post:{}".format(post))
-
+
@frappe.whitelist(allow_guest=True)
-def add_post(group, content, picture, picture_name, title=None, parent_post=None,
+def add_post(group, content, picture, picture_name, title=None, parent_post=None,
assigned_to=None, status=None, event_datetime=None):
-
+
access = get_access(get_pathname(group))
if not access.get("write"):
raise frappe.PermissionError
@@ -64,8 +64,8 @@ def add_post(group, content, picture, picture_name, title=None, parent_post=None
if parent_post:
if frappe.db.get_value("Post", parent_post, "parent_post"):
frappe.throw("Cannot reply to a reply")
-
- group = frappe.get_doc("Website Group", group)
+
+ group = frappe.get_doc("Website Group", group)
post = frappe.get_doc({
"doctype":"Post",
"title": (title or "").title(),
@@ -73,7 +73,7 @@ def add_post(group, content, picture, picture_name, title=None, parent_post=None
"website_group": group.name,
"parent_post": parent_post or None
})
-
+
if not parent_post:
if group.group_type == "Tasks":
post.is_task = 1
@@ -81,38 +81,38 @@ def add_post(group, content, picture, picture_name, title=None, parent_post=None
elif group.group_type == "Events":
post.is_event = 1
post.event_datetime = event_datetime
-
+
post.ignore_permissions = True
post.insert()
if picture_name and picture:
process_picture(post, picture_name, picture)
-
+
# send email
if parent_post:
post.run_method("send_email_on_reply")
-
+
return post.parent_post or post.name
-
+
@frappe.whitelist(allow_guest=True)
def save_post(post, content, picture=None, picture_name=None, title=None,
assigned_to=None, status=None, event_datetime=None):
-
+
post = frappe.get_doc("Post", post)
access = get_access(get_pathname(post.website_group))
-
+
if not access.get("write"):
raise frappe.PermissionError
-
+
# TODO improve error message
if frappe.session.user != post.owner:
for fieldname in ("title", "content"):
if post.get(fieldname) != locals().get(fieldname):
frappe.throw("You cannot change: {}".format(fieldname.title()))
-
+
if picture and picture_name:
frappe.throw("You cannot change: Picture")
-
+
post.update({
"title": (title or "").title(),
"content": content,
@@ -122,34 +122,34 @@ def save_post(post, content, picture=None, picture_name=None, title=None,
})
post.ignore_permissions = True
post.save()
-
+
if picture_name and picture:
process_picture(post, picture_name, picture)
-
+
return post.parent_post or post.name
-
+
def process_picture(post, picture_name, picture):
from frappe.templates.generators.website_group import clear_cache
-
+
file_data = save_file(picture_name, picture, "Post", post.name, decode=True)
post.picture_url = file_data.file_name or file_data.file_url
frappe.db.set_value("Post", post.name, "picture_url", post.picture_url)
clear_cache(website_group=post.website_group)
-
+
@frappe.whitelist()
def suggest_user(group, term):
"""suggest a user that has read permission in this group tree"""
- users = frappe.db.sql("""select
- pr.name, pr.first_name, pr.last_name,
+ users = frappe.db.sql("""select
+ pr.name, pr.first_name, pr.last_name,
pr.user_image, pr.location
from `tabUser` pr
where (pr.first_name like %(term)s or pr.last_name like %(term)s)
- and pr.user_type = 'Website User' and pr.enabled=1""",
+ and pr.user_type = 'Website User' and pr.enabled=1""",
{"term": "%{}%".format(term), "group": group}, as_dict=True)
-
+
template = frappe.get_template("templates/includes/user_display.html")
return [{
- "value": "{} {}".format(pr.first_name or "", pr.last_name or "").strip(),
+ "value": "{} {}".format(pr.first_name or "", pr.last_name or "").strip(),
"user_html": template.render({"user": pr}),
"user": pr.name
} for pr in users]
diff --git a/frappe/utils/fixtures.py b/frappe/utils/fixtures.py
index 9c544704e3..30284c8e1f 100644
--- a/frappe/utils/fixtures.py
+++ b/frappe/utils/fixtures.py
@@ -1,5 +1,5 @@
# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# MIT License. See license.txt
+# MIT License. See license.txt
from __future__ import unicode_literals