From 55416e08f1b7431d4c332babf9ea8785ed59ea38 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 23 Oct 2018 11:52:06 +0530 Subject: [PATCH] [Fix] Marketplace setting permission error --- .../marketplace_settings/marketplace_settings.py | 10 +++++++++- erpnext/public/js/hub/hub_factory.js | 5 +++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/erpnext/hub_node/doctype/marketplace_settings/marketplace_settings.py b/erpnext/hub_node/doctype/marketplace_settings/marketplace_settings.py index 9bfa39f73f..91c7bf5850 100644 --- a/erpnext/hub_node/doctype/marketplace_settings/marketplace_settings.py +++ b/erpnext/hub_node/doctype/marketplace_settings/marketplace_settings.py @@ -5,7 +5,7 @@ from __future__ import unicode_literals import frappe, requests, json, time from frappe.model.document import Document -from frappe.utils import add_years, now, get_datetime, get_datetime_str +from frappe.utils import add_years, now, get_datetime, get_datetime_str, cint from frappe import _ from frappe.frappeclient import FrappeClient from erpnext.utilities.product import get_price, get_qty_in_stock @@ -84,3 +84,11 @@ class MarketplaceSettings(Document): def unregister(self): """Disable the User on hubmarket.org""" pass + +@frappe.whitelist() +def is_marketplace_enabled(): + if not hasattr(frappe.local, 'is_marketplace_enabled'): + frappe.local.is_marketplace_enabled = cint(frappe.db.get_single_value('Marketplace Settings', + 'disable_marketplace')) + + return frappe.local.is_marketplace_enabled diff --git a/erpnext/public/js/hub/hub_factory.js b/erpnext/public/js/hub/hub_factory.js index 506d374f5e..7d9fefc8b9 100644 --- a/erpnext/public/js/hub/hub_factory.js +++ b/erpnext/public/js/hub/hub_factory.js @@ -32,8 +32,9 @@ frappe.views.marketplaceFactory = class marketplaceFactory extends frappe.views. }; function is_marketplace_disabled() { - return frappe.model.with_doc('Marketplace Settings') - .then(doc => doc.disable_marketplace); + return frappe.call({ + method: "erpnext.hub_node.doctype.marketplace_settings.marketplace_settings.is_marketplace_enabled" + }).then(r => r.message) } $(document).on('toolbar_setup', () => {