extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Give some indication that the action is being done for Admin / Clear cache & Wiki / Rebuild links

Browse Source
This commit is contained in:
Nathan Gray 2015-09-09 23:57:07 +00:00
parent b0713a9945
commit 5a950ae8dc
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
admin/inc/class.admin_hooks.inc.php
View File

@ -21,7 +21,7 @@ class admin_hooks
* @var unknown_type
*/
var $public_functions = array(
'register_all_hooks' => True,
'ajax_register_all_hooks' => True,
);
/**
@ -112,7 +112,12 @@ class admin_hooks
if (! $GLOBALS['egw']->acl->check('applications_acc',16,'admin'))
{
$file['Clear cache and register hooks'] = egw::link('/index.php','menuaction=admin.admin_hooks.register_all_hooks');
$file['Clear cache and register hooks'] = array(
'id' => 'admin/clear_cache',
'no_lang' => true,
'link' => "javascript:egw.message('".lang('Clear cache and register hooks') . "<br />" .lang('Please wait...')."','info'); " .
"egw.json('admin.admin_hooks.ajax_register_all_hooks').sendRequest(true);"
);
}
if (! $GLOBALS['egw']->acl->check('asyncservice_acc',1,'admin'))
@ -154,7 +159,7 @@ class admin_hooks
/**
* Register all hooks
*/
function register_all_hooks()
function ajax_register_all_hooks()
{
if ($GLOBALS['egw']->acl->check('applications_acc',16,'admin'))
{
@ -173,7 +178,7 @@ class admin_hooks
// allow apps to hook into "Admin >> Clear cache and register hooks"
$GLOBALS['egw']->hooks->process('clear_cache', array(), true);
$GLOBALS['egw']->redirect_link('/admin/index.php');
egw_json_response::get()->apply('egw.message', array(lang('Done'),'success'));
}
/**

2
admin/js/app.js
View File

@ -303,7 +303,7 @@ app.classes.admin = AppJS.extend(
}
else if (link[0] == '/' || link.substr(0,4) == 'http')
{
this.load(link+(link.match(/\?/)?'&':'?')+'nonavbar=1');
this.load(egw.link(link,'nonavbar=1'));
}
else if (link.substr(0,11) == 'javascript:')
{