holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Admin - Make statistics locked only when date requires it, access through sidebox menu does not lock

Browse Source
This commit is contained in:
nathangray 2019-03-27 11:57:20 -06:00
parent d94f918b89
commit 3c8bf57c74
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/inc/class.admin_ui.inc.php
View File

@ -45,6 +45,8 @@ class admin_ui
if (admin_statistics::check(false)) if (admin_statistics::check(false))
{ {
$_GET['load'] = 'admin.admin_statistics.submit'; $_GET['load'] = 'admin.admin_statistics.submit';
$_GET['ajax'] = 'false';
$_GET['required'] = 'true';
} }
$tpl = new Etemplate('admin.index'); $tpl = new Etemplate('admin.index');

8
admin/js/app.js
View File

@ -132,7 +132,7 @@ app.classes.admin = AppJS.extend(
load: function(_url) load: function(_url)
{ {
if (this.iframe && this.iframe.getDOMNode().contentDocument.location.href if (this.iframe && this.iframe.getDOMNode().contentDocument.location.href
.match(/menuaction=admin.admin_statistics.submit/) && ( !_url || .match(/menuaction=admin.admin_statistics.submit.+required=true/) && ( !_url ||
!_url.match(/statistics=(postpone|canceled|submitted)/))) !_url.match(/statistics=(postpone|canceled|submitted)/)))
{ {
this.egw.message(this.egw.lang('Please submit (or postpone) statistic first'), 'info'); this.egw.message(this.egw.lang('Please submit (or postpone) statistic first'), 'info');
@ -173,6 +173,12 @@ app.classes.admin = AppJS.extend(
{ {
this.iframe.set_src(_url); this.iframe.set_src(_url);
} }
var m = _url.match(/menuaction=([^&]+)(?:.*appname=(\w+))?/);
if(m && m.length >= 2)
{
var app = m[2] ? m[2] : m[1].split('.')[0];
this.tree.set_value('/apps/'+app+'/'+m[1]);
}
} }
else else
{ {