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

fix(minor): show only one avatar in form sidebar if created and updated by the same user

Browse source
This commit is contained in:
Rushabh Mehta 2024-08-15 12:33:07 +05:30
parent be2bef24de
commit 2d4ea4bf23
2 changed files with 37 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
frappe/public/js/frappe/form/sidebar/form_sidebar.js
View file

@ -77,7 +77,12 @@ frappe.ui.form.Sidebar = class {
}
refresh_creation_modified() {
let avatar_group = frappe.avatar_group([this.frm.doc.owner, this.frm.doc.modified_by], 5, {
let user_list = [this.frm.doc.owner, this.frm.doc.modified_by];
if (this.frm.doc.owner === this.frm.doc.modified_by) {
user_list = [this.frm.doc.owner];
}
let avatar_group = frappe.avatar_group(user_list, 5, {
align: "left",
overlap: true,
});
@ -102,17 +107,27 @@ frappe.ui.form.Sidebar = class {
" · " +
comment_when(this.frm.doc.modified);
avatar_group.find(".avatar:first-child").popover({
trigger: "hover",
html: true,
content: creation_message,
});
if (user_list.length === 1) {
// same user created and edited
avatar_group.find(".avatar:last-child").popover({
trigger: "hover",
html: true,
content: modified_message,
});
avatar_group.find(".avatar").popover({
trigger: "hover",
html: true,
content: creation_message + "<br>" + modified_message,
});
} else {
avatar_group.find(".avatar:first-child").popover({
trigger: "hover",
html: true,
content: creation_message,
});
avatar_group.find(".avatar:last-child").popover({
trigger: "hover",
html: true,
content: modified_message,
});
}
}
show_auto_repeat_status() {

19
frappe/public/scss/desk/form.scss
View file

@ -409,15 +409,18 @@
}
}
// for 1, 2 column layouts, implement horizontal, else vertical
.col-sm-12 .horizontal,
.col-sm-6 .horizontal {
display: flex;
justify-content: space-between;
vertical-align: middle;
// above mobile
@media (min-width: map-get($grid-breakpoints, "md")) {
// for 1, 2 column layouts, implement horizontal, else vertical
.col-sm-12 .horizontal,
.col-sm-6 .horizontal {
display: flex;
justify-content: space-between;
vertical-align: middle;
.control-input-wrapper {
width: 50%;
.control-input-wrapper {
width: 50%;
}
}
}