vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

[fix] raise/catch DoesNotExistError in sync desktop icons patch

Browse source
This commit is contained in:
Anand Doshi 2016-03-17 09:48:36 +05:30
parent 6a2b296ace
commit d6e908a3e4
3 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frappe/config/desktop.py
View file

@ -42,12 +42,4 @@ def get_data():
"type": "module",
"system_manager": 1
},
{
"module_name": "All Applications",
"label": _("All Applications"),
"color": "#4aa3df",
"icon": "octicon octicon-three-bars",
"type": "module",
"link": "javascript:frappe.desktop.all_applications.show()"
},
]

2
frappe/desk/doctype/desktop_icon/desktop_icon.py
View file

@ -197,7 +197,7 @@ def make_user_copy(module_name, user):
standard_name = frappe.db.get_value('Desktop Icon', {'module_name': module_name, 'standard': 1})
if not standard_name:
frappe.throw('{0} not found'.format(module_name))
frappe.throw('{0} not found'.format(module_name), frappe.DoesNotExistError)
original = frappe.get_doc('Desktop Icon', standard_name)

14
frappe/patches/v6_24/sync_desktop_icons.py
View file

@ -28,10 +28,16 @@ def execute():
if user_list:
user_list = json.loads(user_list)
for i, module_name in enumerate(user_list):
desktop_icon = get_user_copy(module_name, user=user.name)
desktop_icon.db_set('idx', i)
try:
desktop_icon = get_user_copy(module_name, user=user.name)
desktop_icon.db_set('idx', i)
except frappe.DoesNotExistError:
pass
# set remaining icons as hidden
for module_name in list(set([m['module_name'] for m in modules_list]) - set(user_list)):
desktop_icon = get_user_copy(module_name, user=user.name)
desktop_icon.db_set('hidden', 1)
try:
desktop_icon = get_user_copy(module_name, user=user.name)
desktop_icon.db_set('hidden', 1)
except frappe.DoesNotExistError:
pass