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

Merge pull request #7568 from surajshetty3416/eps-ux

Browse source 
fix(energy points): Show name of the user who actually reverted points
This commit is contained in:
Saurabh 2019-05-28 11:24:17 +05:30 • committed by GitHub
commit 605e024fda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/public/js/frappe/utils/energy_point_utils.js
View file

@ -32,7 +32,6 @@ Object.assign(frappe.energy_points, {
},
get_history_log_message(log) {
const owner_name = frappe.user.full_name(log.owner).bold();
const user = frappe.user.full_name(log.user).bold();
const ref_doc = log.reference_name;
if (log.type === 'Appreciation') {
@ -42,7 +41,7 @@ Object.assign(frappe.energy_points, {
return __('{0} criticized on {1}', [owner_name, ref_doc]);
}
if (log.type === 'Revert') {
return __('{0} reverted {1}', [user, log.revert_of]);
return __('{0} reverted {1}', [owner_name, log.revert_of]);
}
return __('via automatic rule {0} on {1}', [log.rule.bold(), ref_doc]);
},
@ -57,8 +56,7 @@ Object.assign(frappe.energy_points, {
return __('{0} criticized {1}', [owner_name, user]);
}
if (log.type === 'Revert') {
return __('{0} reverted {1}', [user,
frappe.utils.get_form_link('Energy Point Log', log.revert_of, true)]);
return __('{0} reverted {1}', [owner_name, log.revert_of]);
}
return __('gained by {0} via automatic rule {1}', [user, log.rule.bold()]);
},