- Added methods deleteCustomFilter and _fillCustomFilters to controller InfoCenter

- Added method deleteCustomFilter to model Filters_model
- Changed parameter filterId to filter_id in FilterWidget, infocenterData
- Changed CSS and JS in views/widgets/navigationMenu.php to allow two links in one menu item
- Changed NavigationMenuWidget to allow two links in one menu item
This commit is contained in:
Paolo
2018-02-09 15:18:44 +01:00
parent 4dec69ae63
commit c57c953eaa
7 changed files with 119 additions and 46 deletions
@@ -94,8 +94,8 @@
)
ORDER BY "LastAction" DESC
',
'hideHeader' => true,
'hideSave' => true,
'hideHeader' => false,
'hideSave' => false,
'checkboxes' => array('PersonId'),
'additionalColumns' => array('Details'),
'formatRaw' => function($fieldName, $fieldValue, $datasetRaw) {
@@ -139,11 +139,11 @@
}
);
$filterId = isset($_GET['filterId']) ? $_GET['filterId'] : null;
$filterId = isset($_GET[InfoCenter::FILTER_ID]) ? $_GET[InfoCenter::FILTER_ID] : null;
if (isset($filterId) && is_numeric($filterId))
{
$filterWidgetArray['filterId'] = $filterId;
$filterWidgetArray[InfoCenter::FILTER_ID] = $filterId;
}
else
{