blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-06 14:49:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

- InfoCenter controller methods _fillFilters, _fillFiltersFreigegeben and _fillCustomFilters now use NavigationLib->oneLevel

Browse Source 
- NavigationLib added parameter subscriptLinkHref to oneLevel
- NavigationWidget.js method _buildLeftMenuStructure now uses parameter subscriptLinkHref
This commit is contained in:
Paolo
2018-11-23 18:04:40 +01:00
parent 74a8b496bc
commit a741ffbd41
3 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/infocenter/InfoCenter.php
+36 -37
View File
@@ -883,7 +883,7 @@ class InfoCenter extends Auth_Controller
'filters' => $this->navigationlib->oneLevel(
'Filter', // description
'#', // link
(isset($filtersArray['children'])?$filtersArray['children']:''), // children
(isset($filtersArray['children']) ? $filtersArray['children'] : ''), // children
'', // icon
true, // expand
null, // subscriptDescription
@@ -899,20 +899,18 @@ class InfoCenter extends Auth_Controller
/**
* Utility method used to fill elements of the InfoCenter left menu of the main InfoCenter page
*/
private function _fillFilters($filters, &$tofill)
private function _fillFilters($filters, &$toFill)
{
$toPrint = "%s?%s=%s&%s=%s";
foreach ($filters as $filterId => $description)
{
$tofill['children'][] = array(
'link' => sprintf(
$toPrint,
site_url(self::INFOCENTER_URI), 'filter_id', $filterId,
FHC_Controller::FHC_CONTROLLER_ID,
$this->getControllerId()
),
'description' => $description
$toFill['children'][] = $this->navigationlib->oneLevel(
$description, // description
sprintf(
'%s?%s=%s',
site_url(self::INFOCENTER_URI),
'filter_id',
$filterId
) // link
);
}
}
@@ -920,20 +918,18 @@ class InfoCenter extends Auth_Controller
/**
* Utility method used to fill elements of the InfoCenter left menu of the freigegeben InfoCenter page
*/
private function _fillFiltersFreigegeben($filters, &$tofill)
private function _fillFiltersFreigegeben($filters, &$toFill)
{
$toPrint = "%s?%s=%s&%s=%s";
foreach ($filters as $filterId => $description)
{
$tofill['children'][] = array(
'link' => sprintf(
$toPrint,
site_url(self::INFOCENTER_URI.'/'.self::FREIGEGEBEN_PAGE), 'filter_id', $filterId,
FHC_Controller::FHC_CONTROLLER_ID,
$this->getControllerId()
),
'description' => $description
$toFill['children'][] = $this->navigationlib->oneLevel(
$description, // description
sprintf(
'%s?%s=%s',
site_url(self::INFOCENTER_URI.'/'.self::FREIGEGEBEN_PAGE),
'filter_id',
$filterId
) // link
);
}
}
@@ -942,23 +938,26 @@ class InfoCenter extends Auth_Controller
* Utility method used to fill elements of the InfoCenter left menu
* with the list of the custom filter of the authenticated user
*/
private function _fillCustomFilters($filters, &$tofill)
private function _fillCustomFilters($filters, &$toFill)
{
$toPrint = "%s?%s=%s&%s=%s";
foreach ($filters as $filterId => $description)
{
$tofill['children'][] = array(
'link' => sprintf(
$toPrint,
site_url(self::INFOCENTER_URI), 'filter_id', $filterId,
FHC_Controller::FHC_CONTROLLER_ID,
$this->getControllerId()
),
'description' => $description,
'subscriptDescription' => 'Remove',
'subscriptLinkClass' => 'remove-custom-filter',
'subscriptLinkValue' => $filterId
$toFill['children'][] = $this->navigationlib->oneLevel(
$description, // description
sprintf(
'%s?%s=%s',
site_url(self::INFOCENTER_URI),
'filter_id',
$filterId
), // link
null, // children
'', // icon
false, // expand
'Remove', // subscriptDescription
'remove-custom-filter', // subscriptLinkClass
$filterId, // subscriptLinkValue
null, // sort
null // requiredPermissions
);
}
}
application/libraries/NavigationLib.php
+4 -4
View File
@@ -69,7 +69,7 @@ class NavigationLib
public function oneLevel(
$description, $link = '#', $children = null, $icon = '', $expand = false,
$subscriptDescription = null, $subscriptLinkClass = null, $subscriptLinkValue = null, $target = '',
$sort = null, $requiredPermissions = null)
$sort = null, $requiredPermissions = null, $subscriptLinkHref = '#')
{
return array(
'description' => $description,
@@ -82,7 +82,8 @@ class NavigationLib
'subscriptLinkClass' => $subscriptLinkClass,
'subscriptLinkValue' => $subscriptLinkValue,
'sort' => $sort,
'requiredPermissions' => $requiredPermissions
'requiredPermissions' => $requiredPermissions,
'subscriptLinkHref' => $subscriptLinkHref
);
}
@@ -235,8 +236,7 @@ class NavigationLib
{
$extensionArray = array_merge_recursive(
$extensionArray,
$this->_wildcardsearch($config[$configName],
$navigationPage)
$this->_wildcardsearch($config[$configName], $navigationPage)
);
}
}
public/js/NavigationWidget.js
+1 -1
View File
@@ -232,7 +232,7 @@ var FHC_NavigationWidget = {
if (item["subscriptLinkClass"] != null && item["subscriptDescription"] != null)
{
strLeftMenu += '<a class="' + item["subscriptLinkClass"] + ' menuSubscriptLink" value="' + item["subscriptLinkValue"] + '" href="#">' +
strLeftMenu += '<a class="' + item["subscriptLinkClass"] + ' menuSubscriptLink" value="' + item["subscriptLinkValue"] + '" href="' + item["subscriptLinkHref"] + '">' +
' (' + item["subscriptDescription"] + ')' +
'</a>';
strLeftMenu += '</span>';