From 3b52c304626f0ff81b8482ec244f9492711d4840 Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Tue, 10 Dec 2019 23:59:14 +0300
Subject: [PATCH] fix(admin-plugin): fix issue for creating entry process with
 same ids #333

---
 site/plugins/admin/app/Controllers/EntriesController.php | 7 ++++---
 site/plugins/admin/lang/en_US.yaml                       | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/site/plugins/admin/app/Controllers/EntriesController.php b/site/plugins/admin/app/Controllers/EntriesController.php
index a363437f..9dfa03e5 100644
--- a/site/plugins/admin/app/Controllers/EntriesController.php
+++ b/site/plugins/admin/app/Controllers/EntriesController.php
@@ -260,13 +260,14 @@ class EntriesController extends Controller
                 } else {
                     $this->flash->addMessage('error', __('admin_message_entry_was_not_created'));
                 }
-
             } else {
                 $this->flash->addMessage('error', __('admin_message_fieldset_not_found'));
             }
-
-            return $response->withRedirect($this->router->pathFor('admin.entries.index') . '?id=' . $parent_entry_id);
+        } else {
+            $this->flash->addMessage('error', __('admin_message_entry_was_not_created'));
         }
+
+        return $response->withRedirect($this->router->pathFor('admin.entries.index') . '?id=' . $parent_entry_id);
     }
 
     /**
diff --git a/site/plugins/admin/lang/en_US.yaml b/site/plugins/admin/lang/en_US.yaml
index adf877bd..722f7940 100755
--- a/site/plugins/admin/lang/en_US.yaml
+++ b/site/plugins/admin/lang/en_US.yaml
@@ -305,3 +305,4 @@ admin_help_text_for_fieldsets_hide: "Hide fieldsets from entries type select."
 admin_help_text_for_entry_label: "Entry title."
 admin_help_text_for_entry_name: "Entry unique name in lowercase chars only."
 admin_help_text_for_entry_type: "Entry type based on Fieldset."
+admin_message_fieldset_not_found: "Fieldset not found"