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

Merge pull request #1644 from rmehta/timeline-fix

Browse source 
[fix] comment timeline permissions, now show only status change from linked docs
This commit is contained in:
Rushabh Mehta 2016-03-23 12:33:32 +05:30
commit 75cea9cffc
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
frappe/desk/form/load.py
View file

@ -9,7 +9,6 @@ import frappe.defaults
import frappe.desk.form.meta
from frappe.permissions import get_doc_permissions
from frappe import _
from frappe.core.doctype.communication.feed import get_feed_match_conditions
@frappe.whitelist()
def getdoc(doctype, name, user=None):
@ -117,7 +116,6 @@ def get_communications(doctype, name, start=0, limit=20):
def _get_communications(doctype, name, start=0, limit=20):
match_conditions = get_feed_match_conditions()
communications = frappe.db.sql("""select name, communication_type,
communication_medium, comment_type,
content, sender, sender_full_name, creation, subject, delivery_status, _liked_by,
@ -130,12 +128,13 @@ def _get_communications(doctype, name, start=0, limit=20):
communication_type in ("Communication", "Comment")
and (
(reference_doctype=%(doctype)s and reference_name=%(name)s)
or (timeline_doctype=%(doctype)s and timeline_name=%(name)s)
or (timeline_doctype=%(doctype)s
and timeline_name=%(name)s
and communication_type="Comment"
and comment_type in ("Created", "Updated", "Submitted", "Cancelled", "Deleted"))
)
and (comment_type is null or comment_type != 'Update')
{match_conditions}
order by creation desc limit %(start)s, %(limit)s"""
.format(match_conditions=("and " + match_conditions) if match_conditions else ""),
order by creation desc limit %(start)s, %(limit)s""",
{ "doctype": doctype, "name": name, "start": frappe.utils.cint(start), "limit": limit },
as_dict=True)

2
frappe/model/document.py
View file

@ -805,7 +805,7 @@ class Document(BaseDocument):
"comment_type": comment_type,
"reference_doctype": self.doctype,
"reference_name": self.name,
"content": text or _(comment_type),
"content": text or comment_type,
"link_doctype": link_doctype,
"link_name": link_name
}).insert(ignore_permissions=True)

4
frappe/public/js/frappe/form/footer/timeline_item.html
View file

@ -87,7 +87,7 @@
{% if(data.link_doctype && data.link_name) { %}
<a href="#Form/{%= data.link_doctype %}/{%= data.link_name %}">
{% } %}
{%= data.content %}
{%= __(data.content) %}
{% if(data.link_doctype && data.link_name) { %}
</a>
{% } %}
@ -108,7 +108,7 @@
</span>
{% } else { %}
<span title="{%= data.comment_by %}">{%= data.fullname %}</span>
{%= data.content %}
{%= __(data.content) %}
{% if (data.timeline_doctype===data.frm.doc.doctype && data.timeline_name===data.frm.doc.name) { %}
&ndash;
<a href="#Form/{%= data.reference_doctype %}/{%= data.reference_name %}">