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

fix: merge conflict

Browse source
This commit is contained in:
Sagar Vora 2022-03-21 14:18:58 +05:30
parent dbb622fce1
commit 810867a0d5
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
frappe/public/js/frappe/form/footer/form_timeline.js
View file

@ -453,24 +453,17 @@ class FormTimeline extends BaseTimeline {
let edit_wrapper = $(`<div class="comment-edit-box">`).hide();
let edit_box = this.make_editable(edit_wrapper);
let content_wrapper = comment_wrapper.find('.content');
<<<<<<< HEAD
let more_actions_wrapper = comment_wrapper.find('.more-actions');
if (frappe.model.can_delete("Comment")) {
if (frappe.model.can_delete("Comment") && (
frappe.session.user == doc.owner ||
frappe.user.has_role("System Manager")
)) {
const delete_option = $(`
<li>
<a class="dropdown-item">
${__("Delete")}
</a>
</li>
=======
let delete_button = $();
if (frappe.model.can_delete("Comment") && (frappe.session.user == doc.owner || frappe.user.has_role("System Manager"))) {
delete_button = $(`
<button class="btn btn-link action-btn">
${frappe.utils.icon('close', 'sm')}
</button>
>>>>>>> e4137ca8a1 (fix: Other user must not able to delete other user's comment except System Manager (#16018))
`).click(() => this.delete_comment(doc.name));
more_actions_wrapper.find('.dropdown-menu').append(delete_option);
}