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

Code cleanup and fixed print permission error (#6377)

Browse source
This commit is contained in:
rohitwaghchaure 2018-11-12 11:08:18 +05:30 • committed by Rushabh Mehta
parent 57c11adc64
commit 30ee228b4a
2 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
frappe/printing/doctype/print_settings/print_settings.py
View file

@ -5,6 +5,7 @@
from __future__ import unicode_literals
import frappe
from frappe import _
from frappe.utils import cint
from frappe.model.document import Document
@ -31,3 +32,11 @@ class PrintSettings(Document):
except ValidationError:
frappe.throw(_("Failed to connect to server"))
return printer_list
@frappe.whitelist()
def is_print_server_enabled():
if not hasattr(frappe.local, 'enable_print_server'):
frappe.local.enable_print_server = cint(frappe.db.get_single_value('Print Settings',
'enable_print_server'))
return frappe.local.enable_print_server

42
frappe/public/js/frappe/form/print.js
View file

@ -158,35 +158,25 @@ frappe.ui.form.PrintPreview = Class.extend({
let print_server ;
var me = this;
frappe.call({
async: false,
"method": "frappe.client.get",
args: {
doctype: "Print Settings",
name: "enable_print_server"
},
method: "frappe.printing.doctype.print_settings.print_settings.is_print_server_enabled",
callback: function (data) {
print_server = data.message.enable_print_server;
if (data.message) {
frappe.call({
"method": "frappe.utils.print_format.print_by_server",
args: {
doctype: me.frm.doc.doctype,
name: me.frm.doc.name,
print_format: me.selected_format(),
no_letterhead: me.with_letterhead()
},
callback: function (data) {
}
});
} else {
me.new_page_preview(true);
}
}
});
if(print_server){
frappe.call({
async: false,
"method": "frappe.utils.print_format.print_by_server",
args: {
doctype: me.frm.doc.doctype,
name: me.frm.doc.name,
print_format: me.selected_format(),
no_letterhead: me.with_letterhead()
},
callback: function (data) {
}
});
}else{
this.new_page_preview(true);
}
},
new_page_preview: function (printit) {
var me = this;