@@ -284,7 +284,7 @@ def get_template(doctype=None, parent_doctype=None, all_doctypes="No", with_data | |||||
if from_data_import == "Yes" and excel_format == "Yes": | if from_data_import == "Yes" and excel_format == "Yes": | ||||
filename = frappe.generate_hash("", 10) | filename = frappe.generate_hash("", 10) | ||||
with open(filename, 'wb') as f: | with open(filename, 'wb') as f: | ||||
f.write(cstr(w.getvalue()).encode("utf-8")) | |||||
f.write(cstr(w.getvalue()).encode("utf-8")) | |||||
f = open(filename) | f = open(filename) | ||||
reader = csv.reader(f) | reader = csv.reader(f) | ||||
@@ -16,12 +16,12 @@ def execute(filters=None): | |||||
data = frappe.get_list(doctype, fields=fields, as_list=True, user=user) | data = frappe.get_list(doctype, fields=fields, as_list=True, user=user) | ||||
if show_permissions: | if show_permissions: | ||||
columns = columns + ["Read", "Write", "Create", "Delete", "Submit", "Cancel", "Amend", "Print", "Email", | |||||
"Report", "Import", "Export", "Share"] | |||||
data = list(data) | |||||
for i,item in enumerate(data): | |||||
temp = frappe.permissions.get_doc_permissions(frappe.get_doc(doctype, item[0]), False,user) | |||||
data[i] = item+(temp.get("read"),temp.get("write"),temp.get("create"),temp.get("delete"),temp.get("submit"),temp.get("cancel"),temp.get("amend"),temp.get("print"),temp.get("email"),temp.get("report"),temp.get("import"),temp.get("export"),temp.get("share"),) | |||||
columns = columns + ["Read", "Write", "Create", "Delete", "Submit", "Cancel", "Amend", "Print", "Email", | |||||
"Report", "Import", "Export", "Share"] | |||||
data = list(data) | |||||
for i,item in enumerate(data): | |||||
temp = frappe.permissions.get_doc_permissions(frappe.get_doc(doctype, item[0]), False,user) | |||||
data[i] = item+(temp.get("read"),temp.get("write"),temp.get("create"),temp.get("delete"),temp.get("submit"),temp.get("cancel"),temp.get("amend"),temp.get("print"),temp.get("email"),temp.get("report"),temp.get("import"),temp.get("export"),temp.get("share"),) | |||||
return columns, data | return columns, data | ||||
@@ -9,5 +9,5 @@ from frappe.model.document import Document | |||||
class OAuthBearerToken(Document): | class OAuthBearerToken(Document): | ||||
def validate(self): | def validate(self): | ||||
if not self.expiration_time: | if not self.expiration_time: | ||||
self.expiration_time = frappe.utils.datetime.datetime.strptime(self.creation, "%Y-%m-%d %H:%M:%S.%f") + frappe.utils.datetime.timedelta(seconds=self.expires_in) | |||||
self.expiration_time = frappe.utils.datetime.datetime.strptime(self.creation, "%Y-%m-%d %H:%M:%S.%f") + frappe.utils.datetime.timedelta(seconds=self.expires_in) | |||||
@@ -464,8 +464,8 @@ class DbManager: | |||||
""" | """ | ||||
Pass root_conn here for access to all databases. | Pass root_conn here for access to all databases. | ||||
""" | """ | ||||
if db: | |||||
self.db = db | |||||
if db: | |||||
self.db = db | |||||
def get_current_host(self): | def get_current_host(self): | ||||
return self.db.sql("select user()")[0][0].split('@')[1] | return self.db.sql("select user()")[0][0].split('@')[1] | ||||