merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -120,7 +120,6 @@ function doRecompileCacheFile() {
if (!confirm(xe.lang.confirm_run)) return;
var params = new Array();
exec_xml("admin","procAdminRecompileCacheFile", params, completeCacheMessage);
showWaitingFogLayer();
}
function completeCacheMessage(ret_obj) {
alert(ret_obj['message']);
@ -131,8 +130,8 @@ function doResetAdminMenu() {
var params = new Array();
params['menu_srl'] = admin_menu_srl;
exec_xml("admin","procAdminMenuReset", params, completeResetAdminMenu);
showWaitingFogLayer();
}
function completeResetAdminMenu(ret_obj) {
document.location.reload();
}