Merge 2.0 into master

plenta · Sep 6, 2024 · 70ec8b2 · 70ec8b2
2 parents fd6a01d + 18043d4
commit 70ec8b2
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 21 deletions.
diff --git a/src/Plenta/ContaoJobsBasic/Contao/Model/PlentaJobsBasicOfferModel.php b/src/Plenta/ContaoJobsBasic/Contao/Model/PlentaJobsBasicOfferModel.php
@@ -277,7 +277,7 @@ protected function getParams($language)
             $alias = $translation['alias'];
         }
 
-        return (Config::get('useAutoItem') ? '/' : '/items/').($alias ?: $this->id);
+        return '/'.($alias ?: $this->id);
     }
 
     public static function findAllPublished()

diff --git a/...aoJobsBasic/Controller/Contao/ContentElement/PlentaJobsBasicJobOfferDetailsController.php b/...aoJobsBasic/Controller/Contao/ContentElement/PlentaJobsBasicJobOfferDetailsController.php
@@ -58,10 +58,7 @@ public function getJobOffer($language = null): ?PlentaJobsBasicOfferModel
             return $this->jobOffer;
         }
 
-        if (!isset($_GET['items']) && isset($_GET['auto_item']) && Config::get('useAutoItem')) {
-            Input::setGet('items', Input::get('auto_item'));
-        }
-        $alias = Input::get('items');
+        $alias = Input::get('auto_item');
 
         if (null === $alias) {
             return null;

diff --git a/src/Plenta/ContaoJobsBasic/Controller/Contao/FrontendModule/JobOfferListController.php b/src/Plenta/ContaoJobsBasic/Controller/Contao/FrontendModule/JobOfferListController.php
@@ -73,11 +73,11 @@ public function generateJobOfferUrl(PlentaJobsBasicOfferModel $jobOffer, ModuleM
         $objPage = $model->getRelated('jumpTo');
 
         if (!$objPage instanceof PageModel) {
-            $url = ampersand(Environment::get('request'));
+            $url = StringUtil::ampersand(Environment::get('request'));
         } else {
-            $params = (Config::get('useAutoItem') ? '/' : '/items/').($this->metaFieldsHelper->getMetaFields($jobOffer)['alias'] ?: $jobOffer->id);
+            $params = '/'.($this->metaFieldsHelper->getMetaFields($jobOffer)['alias'] ?: $jobOffer->id);
 
-            $url = ampersand($objPage->getFrontendUrl($params));
+            $url = StringUtil::ampersand($objPage->getFrontendUrl($params));
         }
 
         return $url;

diff --git a/src/Plenta/ContaoJobsBasic/Controller/Contao/FrontendModule/JobOfferReaderController.php b/src/Plenta/ContaoJobsBasic/Controller/Contao/FrontendModule/JobOfferReaderController.php
@@ -90,10 +90,7 @@ protected function getResponse(Template $template, ModuleModel $model, Request $
             $template->back = $GLOBALS['TL_LANG']['MSC']['goBack'];
         }
 
-        if (!isset($_GET['items']) && isset($_GET['auto_item']) && Config::get('useAutoItem')) {
-            Input::setGet('items', Input::get('auto_item'));
-        }
-        $alias = Input::get('items');
+        $alias = Input::get('auto_item');
 
         $jobOffer = PlentaJobsBasicOfferModel::findPublishedByIdOrAlias($alias);
 

diff --git a/src/Plenta/ContaoJobsBasic/EventListener/Contao/Hooks/ChangelanguageNavigationListener.php b/src/Plenta/ContaoJobsBasic/EventListener/Contao/Hooks/ChangelanguageNavigationListener.php
@@ -31,10 +31,8 @@ public function onChangelanguageNavigation(ChangelanguageNavigationEvent $event)
     {
         $targetRoot = $event->getNavigationItem()->getRootPage();
         $language = $targetRoot->language;
-        if (!isset($_GET['items']) && isset($_GET['auto_item']) && Config::get('useAutoItem')) {
-            Input::setGet('items', Input::get('auto_item', false, true));
-        }
-        $alias = Input::get('items');
+
+        $alias = Input::get('auto_item', false, true);
 
         if ($alias) {
             $jobOffer = PlentaJobsBasicOfferModel::findPublishedByIdOrAlias($alias);

diff --git a/src/Plenta/ContaoJobsBasic/EventListener/Contao/InsertTagListener.php b/src/Plenta/ContaoJobsBasic/EventListener/Contao/InsertTagListener.php
@@ -113,11 +113,7 @@ public function __invoke(string $tag)
     public function handleAutoItem(): void
     {
         if (null === $this->autoItem) {
-            if (!isset($_GET['items']) && isset($_GET['auto_item']) && Config::get('useAutoItem')) {
-                Input::setGet('items', Input::get('auto_item', false, true));
-            }
-
-            $this->autoItem = Input::get('items');
+            $this->autoItem = Input::get('auto_item', false, true);
         }
     }
 }