also fix organisation selection

slashworks · Feb 3, 2022 · e776b8f · e776b8f
1 parent 8683985
commit e776b8f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/EventListener/GetSearchablePagesListener.php b/src/EventListener/GetSearchablePagesListener.php
@@ -80,7 +80,7 @@ public function __invoke($pages, $rootId = null, $isSitemap = false, $language =
                 continue;
             }
 
-            $jobs = Jobs::findBy(['pid IN('.implode(',', array_map('intval', $organisations)).')'], []);
+            $jobs = Jobs::findBy(['pid IN(' . implode(',', array_map('intval', $organisations)) . ')'], []);
 
             if (null === $jobs) {
                 continue;

diff --git a/src/Module/JobList.php b/src/Module/JobList.php
@@ -3,13 +3,9 @@
 namespace Slashworks\ContaoSimpleJobManagerBundle\Module;
 
 use Contao\Controller;
-use Contao\CoreBundle\ContaoCoreBundle;
-use Contao\Date;
-use Contao\FilesModel;
-use Contao\Image\PictureConfiguration;
-use Contao\Input;
 use Contao\Module;
 use Contao\PageModel;
+use Contao\StringUtil;
 use Slashworks\ContaoSimpleJobManagerBundle\Models\Jobs;
 
 /**
@@ -58,11 +54,14 @@ protected function compile()
         );
 
         if (!$bExpiredJobs) {
-            $aOptions['column'][] = ' validthrough >= ' . $dTime;
+            $aOptions['column'][] = 'validthrough >= ' . $dTime;
         }
 
-        $aJobsByOrganisation = array();
-        $oOrganisations = \Slashworks\ContaoSimpleJobManagerBundle\Models\Organisation::findAll();
+        $organisations = StringUtil::deserialize($this->organisation, true);
+
+        if (!empty($organisations)) {
+            $aOptions['column'][] = 'pid IN(' . implode(',', array_map('intval', $organisations)) . ')';
+        }
 
         $oJobs = Jobs::findAll($aOptions);