Fix #2434

app/Http/Controllers/Transaction/ConvertController.php

@@ -35,6 +35,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Services\Internal\Update\JournalUpdateService;
 use FireflyIII\Support\Http\Controllers\ModelInformation;
+use FireflyIII\Support\Http\Controllers\UserNavigation;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\Validation\AccountValidator;
 use Illuminate\Http\Request;
@@ -49,7 +50,7 @@ use View;
  */
 class ConvertController extends Controller
 {
-    use ModelInformation;
+    use ModelInformation, UserNavigation;
 
     /** @var JournalRepositoryInterface Journals and transactions overview */
     private $repository;
@@ -87,16 +88,16 @@ class ConvertController extends Controller
      */
     public function index(TransactionType $destinationType, TransactionGroup $group)
     {
+        if (!$this->isEditableGroup($group)) {
+            return $this->redirectGroupToAccount($group); // @codeCoverageIgnore
+        }
+
         /** @var TransactionGroupTransformer $transformer */
         $transformer = app(TransactionGroupTransformer::class);
 
         /** @var TransactionJournal $first */
         $first      = $group->transactionJournals()->first();
         $sourceType = $first->transactionType;
-        // return to account.
-        if (!in_array($sourceType->type, [TransactionType::WITHDRAWAL, TransactionType::TRANSFER, TransactionType::DEPOSIT], true)) {
-            return $this->redirectToAccount($first); // @codeCoverageIgnore
-        }
 
         $groupTitle   = $group->title ?? $first->description;
         $groupArray   = $transformer->transformObject($group);
@@ -144,6 +145,10 @@ class ConvertController extends Controller
      */
     public function postIndex(Request $request, TransactionType $destinationType, TransactionGroup $group)
     {
+        if (!$this->isEditableGroup($group)) {
+            return $this->redirectGroupToAccount($group); // @codeCoverageIgnore
+        }
+
         /** @var TransactionJournal $journal */
         foreach ($group->transactionJournals as $journal) {
             // catch FF exception.

app/Http/Controllers/Transaction/DeleteController.php

@@ -26,6 +26,7 @@ use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
+use FireflyIII\Support\Http\Controllers\UserNavigation;
 use Illuminate\Http\RedirectResponse;
 use Log;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -36,6 +37,7 @@ use URL;
  */
 class DeleteController extends Controller
 {
+    use UserNavigation;
     /** @var TransactionGroupRepositoryInterface */
     private $repository;
 
@@ -69,6 +71,10 @@ class DeleteController extends Controller
      */
     public function delete(TransactionGroup $group)
     {
+        if (!$this->isEditableGroup($group)) {
+            return $this->redirectGroupToAccount($group); // @codeCoverageIgnore
+        }
+
         Log::debug(sprintf('Start of delete view for group #%d', $group->id));
 
         $journal = $group->transactionJournals->first();
@@ -94,6 +100,10 @@ class DeleteController extends Controller
      */
     public function destroy(TransactionGroup $group): RedirectResponse
     {
+        if (!$this->isEditableGroup($group)) {
+            return $this->redirectGroupToAccount($group); // @codeCoverageIgnore
+        }
+
         $journal = $group->transactionJournals->first();
         if (null === $journal) {
             throw new NotFoundHttpException;

app/Http/Controllers/Transaction/EditController.php

@@ -25,13 +25,14 @@ namespace FireflyIII\Http\Controllers\Transaction;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Http\Controllers\UserNavigation;
 
 /**
  * Class EditController
  */
 class EditController extends Controller
 {
-
+    use UserNavigation;
     /**
      * EditController constructor.
      * @codeCoverageIgnore
@@ -66,6 +67,10 @@ class EditController extends Controller
      */
     public function edit(TransactionGroup $transactionGroup)
     {
+        if (!$this->isEditableGroup($transactionGroup)) {
+            return $this->redirectGroupToAccount($transactionGroup); // @codeCoverageIgnore
+        }
+
         /** @var AccountRepositoryInterface $repository */
         $repository           = app(AccountRepositoryInterface::class);
         $allowedOpposingTypes = config('firefly.allowed_opposing_types');