Fix #433: Wrong label in location field

cross-solution · Oct 9, 2017 · 52eca78 · cbleek · Oct 10, 2017 · 52eca78
1 parent e026351
commit 52eca78
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/module/Geo/public/js/geoselect.js b/module/Geo/public/js/geoselect.js
@@ -96,8 +96,8 @@
             for (var i=initialValue.length-1; i>=0; i-=1) {
                 console.debug("initVal " + i + ": "+ initialValue[i]);
                 var $option = $('<option selected>Test</option>');
-                $option.val(JSON.stringify(initialValue[i]));
-                $option.text(formatSelection({id: initialValue[i], data: initialValue[i]}));
+                $option.val(initialValue[i]);
+                $option.text(formatSelection({id: initialValue[i], data: $.parseJSON(initialValue[i])}));
                 $node.prepend($option);
             }
             $node.trigger('change');

diff --git a/module/Jobs/src/Jobs/Controller/ManageController.php b/module/Jobs/src/Jobs/Controller/ManageController.php
@@ -558,8 +558,18 @@ public function approvalAction()
 
 
         if ($params == 'declined') {
-            $jobEntity->changeStatus(Status::REJECTED, sprintf(/*@translate*/ "Job opening was rejected by %s", $user->getInfo()->getDisplayName()));
-            $jobEntity->setIsDraft(true);
+            if ($jobEntity instanceOf JobSnapshot)  {
+                $jobEntity->getOriginalEntity()->changeStatus(Status::ACTIVE, sprintf(/*@translate*/ 'Changes were rejected by %s', $user->getDisplayName()));
+            } else {
+                $jobEntity->changeStatus(
+                    Status::REJECTED,
+                    sprintf(/*@translate*/
+                    "Job opening was rejected by %s", $user->getInfo()->getDisplayName()
+                    )
+                );
+                $jobEntity->setIsDraft(true);
+            }
+
             $this->repositoryService->store($jobEntity);
             $jobEvents->trigger(JobEvent::EVENT_JOB_REJECTED, $jobEvent);
             $this->notification()->success(/*@translate */'Job has been rejected');