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

Merge pull request #2308 from rmehta/setup-wizard-fix-1

Browse source 
[fix] for setup wizard in de, fr
This commit is contained in:
Nabin Hait 2016-11-14 11:38:13 +05:30 • committed by GitHub
commit 7d72d64e8a
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -97,13 +97,17 @@ def add_user_icon(_doctype, label=None, link=None, type='link', standard=0):
if not label: label = frappe._(_doctype)
if not link: link = 'List/{0}'.format(_doctype)
# find if a standard icon exists
icon_name = frappe.db.exists('Desktop Icon', {'standard': standard, 'link': link,
'owner': frappe.session.user})
if icon_name and frappe.db.get_value('Desktop Icon', icon_name, 'hidden'):
frappe.db.set_value('Desktop Icon', icon_name, 'hidden', 0)
clear_desktop_icons_cache()
elif not icon_name:
if icon_name:
if frappe.db.get_value('Desktop Icon', icon_name, 'hidden'):
# if it is hidden, unhide it
frappe.db.set_value('Desktop Icon', icon_name, 'hidden', 0)
clear_desktop_icons_cache()
else:
idx = frappe.db.sql('select max(idx) from `tabDesktop Icon` where owner=%s',
frappe.session.user)[0][0] or \
frappe.db.sql('select count(*) from `tabDesktop Icon` where standard=1')[0][0]
@ -135,12 +139,13 @@ def add_user_icon(_doctype, label=None, link=None, type='link', standard=0):
}).insert(ignore_permissions=True)
clear_desktop_icons_cache()
return new_icon.name
icon_name = new_icon.name
except Exception, e:
raise e
else:
return icon_name
return icon_name
@frappe.whitelist()
def set_order(new_order, user=None):
@ -183,10 +188,7 @@ def set_desktop_icons(visible_list):
frappe.db.set_value('Desktop Icon', name, 'hidden', 0)
else:
if frappe.db.exists('DocType', module_name):
icon_name = add_user_icon(module_name)
# make it standard
frappe.db.set_value('Desktop Icon', icon_name, 'standard', 1)
add_user_icon(module_name, standard=1)
# set the order
set_order(visible_list)