[Jobs] Fix event triggering.

cross-solution · Apr 9, 2018 · 59407fa · 59407fa · cbleek · Apr 12, 2018
1 parent cc65301
commit 59407fa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/module/Jobs/src/Jobs/Controller/ManageController.php b/module/Jobs/src/Jobs/Controller/ManageController.php
@@ -551,6 +551,7 @@ public function approvalAction()
         $jobEvent       = $this->jobEvent;
         $jobEvent->setJobEntity($jobEntity);
         $jobEvent->addPortal('XingVendorApi');
+        $jobEvent->setTarget($this);
         $jobEvents      = $this->jobEvents;
         // array with differences between the last snapshot and the actual entity
         // is remains Null if there is no snapshot
@@ -580,7 +581,9 @@ public function approvalAction()
             }
 
             $this->repositoryService->store($jobEntity);
-            $jobEvents->trigger(JobEvent::EVENT_JOB_REJECTED, $jobEvent);
+            $jobEvent->setName(JobEvent::EVENT_JOB_REJECTED);
+
+            $jobEvents->trigger($jobEvent);
             $this->notification()->success(/*@translate */'Job has been rejected');
         }
 
@@ -594,7 +597,8 @@ public function approvalAction()
             }
             $jobEntity->changeStatus(Status::ACTIVE, sprintf(/*@translate*/ "Job opening was activated by %s", $user->getInfo()->getDisplayName()));
             $this->repositoryService->store($jobEntity);
-            $jobEvents->trigger(JobEvent::EVENT_JOB_ACCEPTED, $jobEvent);
+            $jobEvent->setName(JobEvent::EVENT_JOB_ACCEPTED);
+            $jobEvents->trigger($jobEvent);
             //$this->entitySnapshot($jobEntity);
             $this->notification()->success(/* @translate */ 'Job has been approved');
             return $this->redirect()->toRoute('lang/admin/jobs', array('lang' => $this->params('lang')));

diff --git a/module/Jobs/src/Jobs/Listener/MailSender.php b/module/Jobs/src/Jobs/Listener/MailSender.php
@@ -106,10 +106,10 @@ public function onJobCreated(JobEvent $e)
      */
     public function onJobAccepted(JobEvent $e)
     {
-    	$target = $e->getTarget();
+
 
         $this->sendMail(
-            $target->getJobEntity(),
+            $e->getJobEntity(),
             'mail/job-accepted',
             /*@translate*/ 'Your job has been published'
         );
@@ -123,7 +123,7 @@ public function onJobAccepted(JobEvent $e)
     public function onJobRejected(JobEvent $e)
     {
         $this->sendMail(
-            $e->getTarget()->getJobEntity(),
+            $e->getJobEntity(),
             'mail/job-rejected',
             /*@translate*/ 'Your job has been rejected'
         );