Compare commits

...

2 Commits
3 ... 2.7.3-2

3 changed files with 7 additions and 5 deletions

View File

@@ -639,7 +639,7 @@ class ObjectController extends BrickController
$oSet = new DBObjectSet($oSearch, array(), array('this' => $oHostObject, 'ac_query' => '%'.$sQuery.'%'));
$oSet->OptimizeColumnLoad(array($oSearch->GetClassAlias() => array('friendlyname')));
// Note : This limit is also used in the field renderer by typeahead to determine how many suggestions to display
$oSet->SetLimit(MetaModel::GetConfig()->Get('max_display_limit'));
$oSet->SetLimit(MetaModel::GetConfig()->GetMaxDisplayLimit());
// - Retrieving objects
while ($oItem = $oSet->Fetch())

View File

@@ -397,15 +397,16 @@
}
}
};
// N°3995: Loader is shown immediately, otherwise when we have a huge amount of items, we can have a bottleneck on the buildMosaic() function, blocking the display of the loader
showMosaicLoader();
$(document).ready(function(){
// Auto collapse item actions popup
$('body').click(function(){
$('#brick_content_mosaic .item-action-wrapper.collapse.in').collapse('hide');
});
// Build the tree (collapsed)
showMosaicLoader();
// Build the mosaic (collapsed)
buildMosaic(oRawDatas);
hideMosaicLoader();
registerFilterListeners();

View File

@@ -321,6 +321,8 @@
}
};
// N°3995: Loader is shown immediately, otherwise when we have a huge amount of items, we can have a bottleneck on the buildTree() function, blocking the display of the loader
showTreeLoader();
$(document).ready(function(){
// Init expand/collapse all buttons
$('#btn-collapse-all').on('click', function (oEvent) {
@@ -405,7 +407,6 @@
});
// Build the tree (collapsed)
showTreeLoader();
buildTree(oRawDatas);
hideTreeLoader();
registerFilterListeners();