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

Merge branch 'develop' into fix-13167

Browse source
This commit is contained in:
Suraj Shetty 2021-05-20 09:58:04 +05:30 • committed by GitHub
commit 24244d1c7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/public/js/frappe/desk.js
View file

@ -289,7 +289,7 @@ frappe.Application = class Application {
}
if (!frappe.workspaces['home']) {
// default workspace is settings for Frappe
frappe.workspaces['home'] = frappe.workspaces['build'];
frappe.workspaces['home'] = frappe.workspaces[Object.keys(frappe.workspaces)[0]];
}
}

14
frappe/public/js/frappe/form/form.js
View file

@ -1125,9 +1125,17 @@ frappe.ui.form.Form = class FrappeForm {
add_custom_button(label, fn, group) {
// temp! old parameter used to be icon
if(group && group.indexOf("fa fa-")!==-1) group = null;
var btn = this.page.add_inner_button(label, fn, group);
if(btn) {
if (group && group.indexOf("fa fa-") !== -1)
group = null;
let btn = this.page.add_inner_button(label, fn, group);
if (btn) {
// Add actions as menu item in Mobile View
let menu_item_label = group ? `${group} > ${label}` : label;
let menu_item = this.page.add_menu_item(menu_item_label, fn, false);
menu_item.parent().addClass("hidden-lg");
this.custom_buttons[label] = btn;
}
return btn;

6
frappe/public/scss/desk/global.scss
View file

@ -120,6 +120,12 @@ pre {
}
}
.hidden-lg {
@include media-breakpoint-up(md) {
display: none !important;
}
}
.visible-xs {
@include media-breakpoint-up(sm) {
display: none !important;

3
frappe/www/printview.py
View file

@ -505,8 +505,9 @@ window.print();
// close the window after print
// NOTE: doesn't close if print is cancelled in Chrome
// Changed timeout to 5s from 1s because it blocked mobile view rendering
setTimeout(function() {
window.close();
}, 1000);
}, 5000);
</script>
"""