From 95e4141bf21e33a0865d13c4d7755b3288abb1ea Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 30 Aug 2018 11:46:14 +0530 Subject: [PATCH 1/2] fix: Remove unused imports --- erpnext/hub_node/api.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/erpnext/hub_node/api.py b/erpnext/hub_node/api.py index 0f1b0a1fa4..be81effe69 100644 --- a/erpnext/hub_node/api.py +++ b/erpnext/hub_node/api.py @@ -1,7 +1,9 @@ from __future__ import unicode_literals import frappe, json +import io, base64, os, requests from frappe.frappeclient import FrappeClient from frappe.desk.form.load import get_attachments +from frappe.utils.file_manager import get_file_path from six import string_types @frappe.whitelist() @@ -119,9 +121,6 @@ def item_sync_postprocess(): def load_base64_image_from_items(items): - import io, base64, urllib, os, requests, tempfile - from frappe.utils.file_manager import get_file_path - for item in items: file_path = item['image'] file_name = os.path.basename(file_path) From d32e7f8d02ced8a4d09103784ab3ab054cecec7b Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 30 Aug 2018 11:53:46 +0530 Subject: [PATCH 2/2] fix: Administrator cannot register on marketplace --- erpnext/hub_node/doctype/hub_settings/hub_settings.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/erpnext/hub_node/doctype/hub_settings/hub_settings.py b/erpnext/hub_node/doctype/hub_settings/hub_settings.py index 7478db97a8..ab0a7d24ff 100644 --- a/erpnext/hub_node/doctype/hub_settings/hub_settings.py +++ b/erpnext/hub_node/doctype/hub_settings/hub_settings.py @@ -23,10 +23,12 @@ class HubSettings(Document): def register(self): """ Create a User on hub.erpnext.org and return username/password """ + if frappe.session.user == 'Administrator': + frappe.throw(_('Please login as another user to register on Marketplace')) + if 'System Manager' not in frappe.get_roles(): frappe.throw(_('Only users with System Manager role can register on Marketplace'), frappe.PermissionError) - # TODO: site_name for cloud sites self.site_name = frappe.utils.get_url() data = {