From dca4f0f862b6f3d1f4688c79e4ef9978e0f96e76 Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Thu, 22 Aug 2019 13:28:03 +0300
Subject: [PATCH] feat(admin-plugin): update Admin plugin #212 #186

update source workflow
---
 .../admin/app/Controllers/EntriesController.php       | 11 ++++++-----
 .../admin/views/templates/content/entries/source.html |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/site/plugins/admin/app/Controllers/EntriesController.php b/site/plugins/admin/app/Controllers/EntriesController.php
index 5dd3ecc3..422d9cad 100644
--- a/site/plugins/admin/app/Controllers/EntriesController.php
+++ b/site/plugins/admin/app/Controllers/EntriesController.php
@@ -714,6 +714,9 @@ class EntriesController extends Controller
         Arr::delete($entry, 'slug');
         Arr::delete($entry, 'modified_at');
 
+        // Read Entry
+        $_entry = $this->entries->read($this->getEntryID($query), true);
+
         // Fieldsets for current entry template
         $fieldsets_path = PATH['site'] . '/fieldsets/' . (isset($entry['fieldset']) ? $entry['fieldset'] : 'default') . '.yaml';
         $fieldsets = Parser::decode(Filesystem::read($fieldsets_path), 'yaml');
@@ -728,7 +731,8 @@ class EntriesController extends Controller
                         'i' => count($parts),
                         'last' => Arr::last($parts),
                         'id' => $this->getEntryID($query),
-                        'data' => $this->entries->read($this->getEntryID($query), true)['file_data'],
+                        'data' => $_entry['file_data'],
+                        'parser' => $_entry['file_parser'],
                         'type' => $type,
                         'menu_item' => 'entries',
                         'links' => [
@@ -884,14 +888,11 @@ class EntriesController extends Controller
 
         if ($type == 'source') {
 
-            // Read entry
-            $_entry = $this->entries->read($id);
-
             // Data from POST
             $data = $request->getParsedBody();
 
             // Update entry
-            if ($this->entries->update($id, Parser::decode($data['data'], $_entry['file_parser']))) {
+            if ($this->entries->update($id, Parser::decode($data['data'], $data['parser']))) {
                 $this->flash->addMessage('success', __('admin_message_entry_changes_saved'));
             } else {
                 $this->flash->addMessage('error', __('admin_message_entry_changes_not_saved'));
diff --git a/site/plugins/admin/views/templates/content/entries/source.html b/site/plugins/admin/views/templates/content/entries/source.html
index 662b5021..1ae6e564 100644
--- a/site/plugins/admin/views/templates/content/entries/source.html
+++ b/site/plugins/admin/views/templates/content/entries/source.html
@@ -5,6 +5,7 @@
     {{ csrf() }}
     <input type="hidden" name="action" value="save-form">
     <input type="hidden" name="id" value="{{ id }}">
+    <input type="hidden" name="parser" value="{{ parser }}">
     <div class="row">
         <div class="col-12">
             <div class="form-group">