Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign

Browse Source
This commit is contained in:
Prateeksha Singh 2018-08-30 12:01:39 +05:30
commit a4c24bda65
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/hub_node/api.py
View File

@ -1,7 +1,9 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe, json import frappe, json
import io, base64, os, requests
from frappe.frappeclient import FrappeClient from frappe.frappeclient import FrappeClient
from frappe.desk.form.load import get_attachments from frappe.desk.form.load import get_attachments
from frappe.utils.file_manager import get_file_path
from six import string_types from six import string_types
@frappe.whitelist() @frappe.whitelist()
@ -119,9 +121,6 @@ def item_sync_postprocess():
def load_base64_image_from_items(items): 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: for item in items:
file_path = item['image'] file_path = item['image']
file_name = os.path.basename(file_path) file_name = os.path.basename(file_path)

4
erpnext/hub_node/doctype/hub_settings/hub_settings.py
View File

@ -23,10 +23,12 @@ class HubSettings(Document):
def register(self): def register(self):
""" Create a User on hub.erpnext.org and return username/password """ """ 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(): if 'System Manager' not in frappe.get_roles():
frappe.throw(_('Only users with System Manager role can register on Marketplace'), frappe.PermissionError) 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() self.site_name = frappe.utils.get_url()
data = { data = {