Browse Source

fix(domains): remove desktop icons from domainification

version-14
Prateeksha Singh 6 years ago
parent
commit
043e290721
2 changed files with 4 additions and 11 deletions
  1. +3
    -3
      frappe/config/__init__.py
  2. +1
    -8
      frappe/core/doctype/domain/domain.py

+ 3
- 3
frappe/config/__init__.py View File

@@ -34,9 +34,9 @@ def get_modules_from_app(app):

if isinstance(modules, dict):
active_modules_list = []
for m, desktop_icon in iteritems(modules):
desktop_icon['module_name'] = m
active_modules_list.append(desktop_icon)
for m, module in iteritems(modules):
module['module_name'] = m
active_modules_list.append(module)
else:
active_modules_list = []
for m in modules:


+ 1
- 8
frappe/core/doctype/domain/domain.py View File

@@ -18,8 +18,7 @@ class Domain(Document):
self.setup_roles()
self.setup_properties()
self.set_values()
# always set the desktop icons while changing the domain settings
self.setup_desktop_icons()

if not int(frappe.defaults.get_defaults().setup_complete or 0):
# if setup not complete, setup desktop etc.
self.setup_sidebar_items()
@@ -89,12 +88,6 @@ class Domain(Document):
frappe.db.set_value('Portal Settings', None, 'default_role',
self.data.get('default_portal_role'))

def setup_desktop_icons(self):
'''set desktop icons form `data.desktop_icons`'''
from frappe.desk.doctype.desktop_icon.desktop_icon import set_desktop_icons
if self.data.desktop_icons:
set_desktop_icons(self.data.desktop_icons)

def setup_properties(self):
if self.data.properties:
for args in self.data.properties:


Loading…
Cancel
Save