add messages to always show and add attribution to patch
This commit is contained in:
@@ -35,6 +35,7 @@ def execute():
|
|||||||
reload_doc('setup', 'page', 'modules_setup')
|
reload_doc('setup', 'page', 'modules_setup')
|
||||||
reload_doc('utilities', 'page', 'users')
|
reload_doc('utilities', 'page', 'users')
|
||||||
reload_doc('home', 'page', 'activity')
|
reload_doc('home', 'page', 'activity')
|
||||||
|
reload_doc('home', 'page', 'attributions')
|
||||||
reload_doc('core', 'doctype', 'profile')
|
reload_doc('core', 'doctype', 'profile')
|
||||||
|
|
||||||
# update user_image in profile
|
# update user_image in profile
|
||||||
|
|||||||
@@ -2234,7 +2234,7 @@ erpnext.startup.set_globals=function(){pscript.is_erpnext_saas=cint(wn.control_p
|
|||||||
/*
|
/*
|
||||||
* erpnext/startup/startup.js
|
* erpnext/startup/startup.js
|
||||||
*/
|
*/
|
||||||
var current_module;var is_system_manager=0;wn.provide('erpnext.startup');erpnext.modules={'Selling':'selling-home','Accounts':'accounts-home','Stock':'stock-home','Buying':'buying-home','Support':'support-home','Projects':'projects-home','Production':'production-home','Website':'website-home','HR':'hr-home','Setup':'Setup','Activity':'activity','To Do':'todo','Calendar':'calendar','Messages':'messages','Knowledge Base':'questions','Dashboard':'dashboard'}
|
var current_module;var is_system_manager=0;wn.provide('erpnext.startup');erpnext.modules={'Selling':'selling-home','Accounts':'accounts-home','Stock':'stock-home','Buying':'buying-home','Support':'support-home','Projects':'projects-home','Production':'production-home','Website':'website-home','HR':'hr-home','Setup':'Setup','Activity':'activity','To Do':'todo','Calendar':'calendar','Messages':'messages','Knowledge Base':'questions','Dashboard':'dashboard'}
|
||||||
erpnext.startup.set_globals=function(){pscript.is_erpnext_saas=cint(wn.control_panel.sync_with_gateway)
|
erpnext.startup.set_globals=function(){pscript.is_erpnext_saas=cint(wn.control_panel.sync_with_gateway)
|
||||||
if(inList(user_roles,'System Manager'))is_system_manager=1;}
|
if(inList(user_roles,'System Manager'))is_system_manager=1;}
|
||||||
erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.custom_css){set_style(wn.boot.custom_css);}
|
erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.custom_css){set_style(wn.boot.custom_css);}
|
||||||
|
|||||||
@@ -1082,7 +1082,7 @@ erpnext.startup.set_globals=function(){pscript.is_erpnext_saas=cint(wn.control_p
|
|||||||
if(inList(user_roles,'System Manager'))is_system_manager=1;}
|
if(inList(user_roles,'System Manager'))is_system_manager=1;}
|
||||||
erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.custom_css){set_style(wn.boot.custom_css);}
|
erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.custom_css){set_style(wn.boot.custom_css);}
|
||||||
if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);}
|
if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);}
|
||||||
if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity'])
|
if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity','Messages'])
|
||||||
erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('<div class="web-footer erpnext-footer">\
|
erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('<div class="web-footer erpnext-footer">\
|
||||||
<a href="#!attributions">ERPNext | Attributions and License</a></div>');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup();}}
|
<a href="#!attributions">ERPNext | Attributions and License</a></div>');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup();}}
|
||||||
$('#startup_div').toggle(false);}
|
$('#startup_div').toggle(false);}
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
781
|
782
|
||||||
Reference in New Issue
Block a user