Used controller plugin job dispatcher.

omeka · Jan 28, 2018 · 65072c6 · 65072c6
1 parent 49d411a
commit 65072c6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 45 deletions.
diff --git a/application/config/module.config.php b/application/config/module.config.php
@@ -301,9 +301,10 @@
             'Omeka\Controller\Site\Page' => Controller\Site\PageController::class,
             'Omeka\Controller\Admin\Asset' => Controller\Admin\AssetController::class,
             'Omeka\Controller\Admin\Index' => Controller\Admin\IndexController::class,
+            'Omeka\Controller\Admin\ItemSet' => Controller\Admin\ItemSetController::class,
+            'Omeka\Controller\Admin\Media' => Controller\Admin\MediaController::class,
             'Omeka\Controller\Admin\Property' => Controller\Admin\PropertyController::class,
             'Omeka\Controller\Admin\ResourceClass' => Controller\Admin\ResourceClassController::class,
-            'Omeka\Controller\Admin\Media' => Controller\Admin\MediaController::class,
             'Omeka\Controller\Admin\Setting' => Controller\Admin\SettingController::class,
             'Omeka\Controller\SiteAdmin\Page' => Controller\SiteAdmin\PageController::class,
         ],
@@ -319,7 +320,6 @@
             'Omeka\Controller\Admin\SystemInfo' => Service\Controller\Admin\SystemInfoControllerFactory::class,
             'Omeka\Controller\Admin\Vocabulary' => Service\Controller\Admin\VocabularyControllerFactory::class,
             'Omeka\Controller\Admin\Item' => Service\Controller\Admin\ItemControllerFactory::class,
-            'Omeka\Controller\Admin\ItemSet' => Service\Controller\Admin\ItemSetControllerFactory::class,
             'Omeka\Controller\SiteAdmin\Index' => Service\Controller\SiteAdmin\IndexControllerFactory::class,
         ],
     ],

diff --git a/application/src/Controller/Admin/ItemController.php b/application/src/Controller/Admin/ItemController.php
@@ -4,7 +4,6 @@
 use Omeka\Form\ConfirmForm;
 use Omeka\Form\ResourceForm;
 use Omeka\Form\ResourceBatchUpdateForm;
-use Omeka\Job\Dispatcher;
 use Omeka\Media\Ingester\Manager;
 use Omeka\Stdlib\Message;
 use Zend\Mvc\Controller\AbstractActionController;
@@ -18,19 +17,12 @@ class ItemController extends AbstractActionController
      */
     protected $mediaIngesters;
 
-    /**
-     * @var Dispatcher
-     */
-    protected $dispatcher;
-
     /**
      * @param Manager $mediaIngesters
-     * @param Dispatcher $dispatcher
      */
-    public function __construct(Manager $mediaIngesters, Dispatcher $dispatcher)
+    public function __construct(Manager $mediaIngesters)
     {
         $this->mediaIngesters = $mediaIngesters;
-        $this->dispatcher = $dispatcher;
     }
 
     public function searchAction()
@@ -187,7 +179,7 @@ public function batchDeleteAllAction()
         $form = $this->getForm(ConfirmForm::class);
         $form->setData($this->getRequest()->getPost());
         if ($form->isValid()) {
-            $job = $this->dispatcher->dispatch('Omeka\Job\BatchDelete', [
+            $job = $this->jobDispatcher()->dispatch('Omeka\Job\BatchDelete', [
                 'resource' => 'items',
                 'query' => $query,
             ]);
@@ -339,7 +331,7 @@ public function batchEditAllAction()
             if ($form->isValid()) {
                 list($dataRemove, $dataAppend) = $this->preprocessBatchUpdateData($data);
 
-                $job = $this->dispatcher->dispatch('Omeka\Job\BatchUpdate', [
+                $job = $this->jobDispatcher()->dispatch('Omeka\Job\BatchUpdate', [
                     'resource' => 'items',
                     'query' => $query,
                     'data_remove' => $dataRemove,

diff --git a/application/src/Controller/Admin/ItemSetController.php b/application/src/Controller/Admin/ItemSetController.php
@@ -4,26 +4,12 @@
 use Omeka\Form\ConfirmForm;
 use Omeka\Form\ResourceForm;
 use Omeka\Form\ResourceBatchUpdateForm;
-use Omeka\Job\Dispatcher;
 use Omeka\Stdlib\Message;
 use Zend\Mvc\Controller\AbstractActionController;
 use Zend\View\Model\ViewModel;
 
 class ItemSetController extends AbstractActionController
 {
-    /**
-     * @var Dispatcher
-     */
-    protected $dispatcher;
-
-    /**
-     * @param Dispatcher $dispatcher
-     */
-    public function __construct(Dispatcher $dispatcher)
-    {
-        $this->dispatcher = $dispatcher;
-    }
-
     public function searchAction()
     {
         $view = new ViewModel;
@@ -231,7 +217,7 @@ public function batchDeleteAllAction()
         $form = $this->getForm(ConfirmForm::class);
         $form->setData($this->getRequest()->getPost());
         if ($form->isValid()) {
-            $job = $this->dispatcher->dispatch('Omeka\Job\BatchDelete', [
+            $job = $this->jobDispatcher()->dispatch('Omeka\Job\BatchDelete', [
                 'resource' => 'item_sets',
                 'query' => $query,
             ]);
@@ -317,7 +303,7 @@ public function batchEditAllAction()
             if ($form->isValid()) {
                 list($dataRemove, $dataAppend) = $this->preprocessBatchUpdateData($data);
 
-                $job = $this->dispatcher->dispatch('Omeka\Job\BatchUpdate', [
+                $job = $this->jobDispatcher()->dispatch('Omeka\Job\BatchUpdate', [
                     'resource' => 'item_sets',
                     'query' => $query,
                     'data_remove' => $dataRemove,

diff --git a/application/src/Service/Controller/Admin/ItemControllerFactory.php b/application/src/Service/Controller/Admin/ItemControllerFactory.php
@@ -10,8 +10,7 @@ class ItemControllerFactory implements FactoryInterface
     public function __invoke(ContainerInterface $services, $requestedName, array $options = null)
     {
         return new ItemController(
-            $services->get('Omeka\Media\Ingester\Manager'),
-            $services->get('Omeka\Job\Dispatcher')
+            $services->get('Omeka\Media\Ingester\Manager')
         );
     }
 }
diff --git a/application/src/Service/Controller/Admin/ItemSetControllerFactory.php b/application/src/Service/Controller/Admin/ItemSetControllerFactory.php