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

fix: Activity feed render and click

Browse source
This commit is contained in:
Faris Ansari 2019-08-21 01:46:10 +05:30
parent c3c1aa04c9
commit e0022944bd
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/desk/page/activity/activity.js
View file

@ -29,6 +29,12 @@ frappe.pages['activity'].on_page_load = function(wrapper) {
doctype = $(this).attr("data-doctype"),
docname = $(this).attr("data-docname");
var [link_doctype, link_name, doctype, docname] =
[link_doctype, link_name, doctype, docname].map(decodeURIComponent);
link_doctype = link_doctype && link_doctype !== 'null' ? link_doctype : null;
link_name = link_name && link_name !== 'null' ? link_name : null;
if (doctype && docname) {
if (link_doctype && link_name) {
frappe.route_options = {

8
frappe/desk/page/activity/activity_row.html
View file

@ -2,10 +2,10 @@
<div class="col-xs-3 text-right activity-date"><span class="{%= date_class %}">
{%= date_sep || "" %}</span></div>
<div class="col-xs-9 activity-message"
data-doctype="{%= reference_doctype %}"
data-docname="{%= reference_name %}"
data-link-doctype="{{ link_doctype }}"
data-link-name="{{ link_name }}"
data-doctype="{%= encodeURIComponent(reference_doctype) %}"
data-docname="{%= encodeURIComponent(reference_name) %}"
data-link-doctype="{{ encodeURIComponent(link_doctype) }}"
data-link-name="{{ encodeURIComponent(link_name) }}"
title="{%= by %} / {%= frappe.datetime.str_to_user(creation) %}">
{{ avatar }}
<span class="small">