Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed login url

Browse Source
This commit is contained in:
Rushabh Mehta 2011-10-11 10:58:11 +05:30
parent 6edb4635e6
commit 5f66d60bdd
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
erpnext/startup/startup.js
View File

@ -43,18 +43,8 @@ function startup_setup() {
// ------------------ // ------------------
$dh(page_body.footer); $dh(page_body.footer);
// for logout and payment // setup toolbar
var callback = function(r,rt) { pscript.startup_setup_toolbar();
if(r.message){
login_file = 'http://' + r.message;
}
else if(pscript.is_erpnext_saas) {
login_file = 'https://www.erpnext.com';
}
// setup toolbar
pscript.startup_setup_toolbar();
}
$c_obj('Home Control', 'get_login_url', '', callback);
} }
// ==================================================================== // ====================================================================
@ -299,10 +289,17 @@ SidebarItem.prototype.show_items = function() {
// add to menu-item mapper // add to menu-item mapper
menu_item_map['Page'][me.det.module_label + ' Custom Reports'] = smi.pointer; menu_item_map['Page'][me.det.module_label + ' Custom Reports'] = smi.pointer;
} }
} }
if(r.login_url){
login_file = 'http://' + r.login_url;
}
else if(pscript.is_erpnext_saas) {
login_file = 'https://www.erpnext.com';
}
$(me.items_area).slideDown(); $(me.items_area).slideDown();
// high light // high light