extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 16:03:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken locking on statistics page

Browse Source
This commit is contained in:
nathangray 2019-03-21 13:14:56 -06:00
parent 729c33ddaf
commit 9741205576
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
admin/js/app.js
View File

@ -134,8 +134,8 @@ 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/) && .match(/menuaction=admin.admin_statistics.submit/) && ( !_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');
return; // do not allow to leave statistics submit return; // do not allow to leave statistics submit
@ -359,13 +359,12 @@ app.classes.admin = AppJS.extend(
var link = _widget.getUserData(_id, 'link'); var link = _widget.getUserData(_id, 'link');
this.groups.set_disabled(true); this.groups.set_disabled(true);
this.nm.set_disabled(false);
if (_id == '/accounts' || _id.substr(0, 8) == '/groups/') if (_id == '/accounts' || _id.substr(0, 8) == '/groups/')
{ {
this.load(); this.load();
var parts = _id.split('/'); var parts = _id.split('/');
this.et2.getWidgetById('nm').applyFilters({ filter: parts[2] ? parts[2] : '', search: ''}); this.nm.applyFilters({ filter: parts[2] ? parts[2] : '', search: ''});
} }
else if (_id === '/groups') else if (_id === '/groups')
{ {