diff --git a/workflow/engine/menus/setup.php b/workflow/engine/menus/setup.php index adb669db4..4bae6ab37 100755 --- a/workflow/engine/menus/setup.php +++ b/workflow/engine/menus/setup.php @@ -58,7 +58,6 @@ if ($RBAC->userCanAccess('PM_SETUP') == 1) { $G_TMP_MENU->AddIdRawOption('PM_TABLES', '../pmTables', G::LoadTranslation('ID_ADDITIONAL_TABLES'), 'icon-tables.png','', 'settings'); $G_TMP_MENU->AddIdRawOption('WEBSERVICES', 'webServices', G::LoadTranslation('ID_WEB_SERVICES'), 'icon-webservices.png', '', 'settings'); - //$G_TMP_MENU->AddIdRawOption('LOG_CASE_SCHEDULER', '../cases/cases_Scheduler_Log', G::LoadTranslation('ID_LOG_CASE_SCHEDULER'), "icon-logs-list.png",'', 'settings'); $G_TMP_MENU->AddIdRawOption('LOGIN', 'loginSettings', G::LoadTranslation('LOGIN'), "",'', 'settings'); $G_TMP_MENU->AddIdRawOption('DASHBOARD', '../dashboard/dashletsList', ucfirst(G::LoadTranslation('ID_DASHBOARD')), '', '', 'settings'); } @@ -84,7 +83,7 @@ if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') == 1) { if ($RBAC->userCanAccess('PM_SETUP') == 1) { $G_TMP_MENU->AddIdRawOption('EVENT', '../events/eventList', G::LoadTranslation('ID_EVENTS'), '', '', 'logs'); - $G_TMP_MENU->AddIdRawOption('LOG_CASE_SCHEDULER', '../cases/cases_Scheduler_Log', G::LoadTranslation('ID_LOG_CASE_SCHEDULER'), "icon-logs-list.png",'', 'logs'); + $G_TMP_MENU->AddIdRawOption('LOG_CASE_SCHEDULER', '../cases/cases_Scheduler_Log', G::LoadTranslation('ID_CASE_SCHEDULER'), "icon-logs-list.png",'', 'logs'); } diff --git a/workflow/engine/xmlform/login/newSiteAdd.xml b/workflow/engine/xmlform/login/newSiteAdd.xml index d10fd23e9..099ec7116 100755 --- a/workflow/engine/xmlform/login/newSiteAdd.xml +++ b/workflow/engine/xmlform/login/newSiteAdd.xml @@ -19,7 +19,7 @@ Report Database: - Drop database if exist + Drop database if exists Workspace Administrator @@ -59,7 +59,7 @@ "+ G_STRINGS.NEW_SITE_SUCCESS_CONFIRM+"
"+ G_STRINGS.NEW_SITE_SUCCESS_CONFIRMNOTE, action: function(){ if (typeof(window.parent.admToolsContent) != 'undefined'){ - + parent.window.location="/sys"+data.name.value+"/en/classic/login/login"; } else { - + setTimeout('redirectLogin()', 1000); } }.extend(this), @@ -159,7 +159,7 @@ width:380, height:140 }); - + data.goto.enable(); data.submit.disable(); data.reset.disable(); @@ -177,9 +177,9 @@ ed('disable'); }; //data.name.passed(); - + function redirectLogin(){ location.href="/sys"+data.name.value+"/en/classic/login/login"; } ]]>
- +