Skip to content
This repository has been archived by the owner on Aug 13, 2022. It is now read-only.

Generator update 06-02-2020 #92

Merged
merged 1 commit into from Feb 6, 2020
Merged

Generator update 06-02-2020 #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/MU/NewsModule/Base/bootstrap.php
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
* @author Michael Ueberschaer <info@homepages-mit-zikula.de>. * @author Michael Ueberschaer <info@homepages-mit-zikula.de>.
* @see https://homepages-mit-zikula.de * @see https://homepages-mit-zikula.de
* @see https://ziku.la * @see https://ziku.la
* @version Generated by ModuleStudio 1.4.0 (https://modulestudio.de) at Thu Feb 06 18:32:27 GMT 2020. * @version Generated by ModuleStudio 1.4.0 (https://modulestudio.de) at Thu Feb 06 19:43:47 GMT 2020.
*/ */


/** /**
Expand Down
31 changes: 19 additions & 12 deletions modules/MU/NewsModule/Helper/Base/AbstractControllerHelper.php
View file
Open in desktop
Expand Up @@ -19,6 +19,7 @@
use Zikula\Common\Translator\TranslatorInterface; use Zikula\Common\Translator\TranslatorInterface;
use Zikula\Common\Translator\TranslatorTrait; use Zikula\Common\Translator\TranslatorTrait;
use Zikula\Component\SortableColumns\SortableColumns; use Zikula\Component\SortableColumns\SortableColumns;
use Zikula\Core\Doctrine\EntityAccess;
use Zikula\Core\RouteUrl; use Zikula\Core\RouteUrl;
use Zikula\ExtensionsModule\Api\ApiInterface\VariableApiInterface; use Zikula\ExtensionsModule\Api\ApiInterface\VariableApiInterface;
use Zikula\UsersModule\Entity\UserEntity; use Zikula\UsersModule\Entity\UserEntity;
Expand Down Expand Up @@ -207,6 +208,18 @@ public function processViewActionParameters(
$contextArgs $contextArgs
); );


$urlParameters = $templateParameters;
foreach ($urlParameters as $parameterName => $parameterValue) {
if (
false === stripos($parameterName, 'thumbRuntimeOptions')
&& false === stripos($parameterName, 'featureActivationHelper')
&& false === stripos($parameterName, 'permissionHelper')
) {
continue;
}
unset($urlParameters[$parameterName]);
}

$quickNavFormType = 'MU\NewsModule\Form\Type\QuickNavigation\\' $quickNavFormType = 'MU\NewsModule\Form\Type\QuickNavigation\\'
. ucfirst($objectType) . 'QuickNavType' . ucfirst($objectType) . 'QuickNavType'
; ;
Expand All @@ -220,6 +233,7 @@ public function processViewActionParameters(
} }
if (in_array($fieldName, ['all', 'own', 'num'], true)) { if (in_array($fieldName, ['all', 'own', 'num'], true)) {
$templateParameters[$fieldName] = $fieldValue; $templateParameters[$fieldName] = $fieldValue;
$urlParameters[$fieldName] = $fieldValue;
} elseif ('sort' === $fieldName && !empty($fieldValue)) { } elseif ('sort' === $fieldName && !empty($fieldValue)) {
$sort = $fieldValue; $sort = $fieldValue;
} elseif ('sortdir' === $fieldName && !empty($fieldValue)) { } elseif ('sortdir' === $fieldName && !empty($fieldValue)) {
Expand All @@ -229,29 +243,22 @@ public function processViewActionParameters(
&& false === stripos($fieldName, 'featureActivationHelper') && false === stripos($fieldName, 'featureActivationHelper')
&& false === stripos($fieldName, 'permissionHelper') && false === stripos($fieldName, 'permissionHelper')
) { ) {
// set filter as query argument, fetched inside repository // set filter as query argument, fetched inside CollectionFilterHelper
if ($fieldValue instanceof UserEntity) { if ($fieldValue instanceof UserEntity) {
$fieldValue = $fieldValue->getUid(); $fieldValue = $fieldValue->getUid();
} }
$request->query->set($fieldName, $fieldValue); $request->query->set($fieldName, $fieldValue);
if ($fieldValue instanceof EntityAccess) {
$fieldValue = $fieldValue->getKey();
}
$urlParameters[$fieldName] = $fieldValue;
} }
} }
} }
$sortableColumns->setOrderBy($sortableColumns->getColumn($sort), strtoupper($sortdir)); $sortableColumns->setOrderBy($sortableColumns->getColumn($sort), strtoupper($sortdir));
$resultsPerPage = $templateParameters['num']; $resultsPerPage = $templateParameters['num'];
$request->query->set('own', $templateParameters['own']); $request->query->set('own', $templateParameters['own']);


$urlParameters = $templateParameters;
foreach ($urlParameters as $parameterName => $parameterValue) {
if (
false === stripos($parameterName, 'thumbRuntimeOptions')
&& false === stripos($parameterName, 'featureActivationHelper')
) {
continue;
}
unset($urlParameters[$parameterName]);
}

$sortableColumns->setAdditionalUrlParameters($urlParameters); $sortableColumns->setAdditionalUrlParameters($urlParameters);
$useJoins = in_array($objectType, ['message']); $useJoins = in_array($objectType, ['message']);


Expand Down
2 changes: 1 addition & 1 deletion modules/MU/NewsModule/bootstrap.php
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
* @author Michael Ueberschaer <info@homepages-mit-zikula.de>. * @author Michael Ueberschaer <info@homepages-mit-zikula.de>.
* @see https://homepages-mit-zikula.de * @see https://homepages-mit-zikula.de
* @see https://ziku.la * @see https://ziku.la
* @version Generated by ModuleStudio 1.4.0 (https://modulestudio.de) at Thu Feb 06 18:32:27 GMT 2020. * @version Generated by ModuleStudio 1.4.0 (https://modulestudio.de) at Thu Feb 06 19:43:47 GMT 2020.
*/ */


/** /**
Expand Down