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

fix: Sidebar assignment style

Browse source
This commit is contained in:
Suraj Shetty 2020-07-10 12:01:49 +05:30
parent 781b8de861
commit 8fee13e2df
2 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
frappe/public/js/frappe/form/sidebar/assign_to.js
View file

@ -5,10 +5,8 @@
frappe.ui.form.AssignTo = Class.extend({
init: function(opts) {
var me = this;
$.extend(this, opts);
this.btn = this.parent.find(".add-assignment").on("click", function() { me.add(); });
this.btn = this.parent.find(".add-assignment-btn > button").on("click", () => this.add());
this.btn_wrapper = this.btn.parent();
this.refresh();
@ -44,33 +42,34 @@ frappe.ui.form.AssignTo = Class.extend({
user_info.description = assignment.description || "";
this.get_assignment_block(user_info).insertBefore(add_assignment_button);
if (assignment.owner===frappe.session.user) {
if (assignment.owner === frappe.session.user) {
this.primary_action = this.frm.page.add_menu_item(__("Assignment Complete"), () => {
this.remove(frappe.session.user);
}, "fa fa-check", "btn-success");
}
if (!(assignment.owner === frappe.session.user || this.frm.perm[0].write)) {
this.parent.find('a.remove-btn').remove();
}
});
// set remove
this.parent.find('a.remove-btn').click(el => {
this.remove(el.attr('data-owner'));
this.parent.find('.remove-btn').click(el => {
this.remove($(el.currentTarget).attr('data-owner'));
return false;
});
},
get_assignment_block(assignee_info) {
let remove_assignment_btn = '';
if (assignee_info.owner === frappe.session.user || this.frm.perm[0].write) {
remove_assignment_btn = `
<span class="remove-btn cursor-pointer" data-owner="${assignee_info.owner}">
${frappe.utils.icon('close')}
</span>
`;
}
return $(`
<li class="assignment-row">
<div class="assignment-pill">
<span class="pill-label">${assignee_info.fullname}</span>
<span class="remove-btn cursor-pointer" data-owner="${assignee_info.owner}">
${frappe.utils.icon('close')}
</span>
${remove_assignment_btn}
</div>
</li>
`);

4
frappe/public/scss/sidebar.scss
View file

@ -404,8 +404,8 @@ body[data-route^="Module"] .main-menu {
margin-right: $margin-xs;
display: inline-block;
.assignment-pill {
.pill-label {
margin-right: $margin-xs;
.remove-btn {
margin-left: $margin-xs;
}
background-color: var(--grey-2-50);
border-radius: var(--border-radius);