mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-25 09:23:28 +01:00
Fix hidden nm with no initial rows were requesting data too early
This commit is contained in:
parent
f2c763dc4d
commit
104680c477
@ -65,12 +65,13 @@ class admin_ui
|
||||
'placeholder_actions' => array('add')
|
||||
);
|
||||
$content['groups'] = array(
|
||||
'get_rows' => 'admin_ui::get_groups',
|
||||
'no_cat' => true,
|
||||
'no_filter' => true,
|
||||
'no_filter2' => true,
|
||||
'row_id' => 'account_id',
|
||||
'actions' => self::group_actions(),
|
||||
'get_rows' => 'admin_ui::get_groups',
|
||||
'no_cat' => true,
|
||||
'no_filter' => true,
|
||||
'no_filter2' => true,
|
||||
'num_rows' => 0,
|
||||
'row_id' => 'account_id',
|
||||
'actions' => self::group_actions(),
|
||||
'placeholder_actions' => array('add')
|
||||
);
|
||||
|
||||
|
@ -500,6 +500,7 @@ class AdminApp extends EgwApp
|
||||
{
|
||||
this.nm.set_disabled(true);
|
||||
this.groups.set_disabled(false);
|
||||
jQuery(this.et2.parentNode).trigger('show.et2_nextmatch');
|
||||
}
|
||||
|
||||
|
||||
|
@ -2428,10 +2428,18 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
|
||||
// TODO this.controller.setFilters(this.activeFilters);
|
||||
|
||||
// If no data was sent from the server, and num_rows is 0, the nm will be empty.
|
||||
// This triggers a cache check.
|
||||
// This triggers a cache check if visible
|
||||
if(!this.options.settings.num_rows && this.controller)
|
||||
{
|
||||
this.controller.update();
|
||||
if(jQuery(this.getDOMNode()).filter(":visible").length > 0)
|
||||
{
|
||||
this.controller.update();
|
||||
}
|
||||
else
|
||||
{
|
||||
// Not visible, queue it up
|
||||
this._queue_refresh([], et2_nextmatch.EDIT);
|
||||
}
|
||||
}
|
||||
|
||||
// Load the default sort order
|
||||
|
Loading…
Reference in New Issue
Block a user