Admin 1.0.6

Author: Awilum

CHANGELOG.md

@@ -1,3 +1,10 @@
+<a name="1.0.6"></a>
+# [1.0.6](https://github.com/flextype-plugins/admin) (2020-06-10)
+
+### Bug Fixes
+
+* **entries-controller** updates for Form Plugin 1.1.0
+
 <a name="1.0.5"></a>
 # [1.0.5](https://github.com/flextype-plugins/admin) (2020-05-26)
 

app/Controllers/EntriesController.php

@@ -76,10 +76,10 @@ public function index(Request $request, Response $response) : Response
             foreach ($fieldsets_list as $fieldset) {
                 if ($fieldset['type'] == 'file' && $fieldset['extension'] == 'yaml') {
                     $fieldset_content = $this->serializer->decode(Filesystem::read($fieldset['path']), 'yaml');
-                    if (isset($fieldset_content['sections']) &&
-                        isset($fieldset_content['sections']['main']) &&
-                        isset($fieldset_content['sections']['main']['form']['fields']) &&
-                        isset($fieldset_content['sections']['main']['form']['fields']['title'])) {
+                    if (isset($fieldset_content['form']) &&
+                        isset($fieldset_content['form']['tabs']) &&
+                        isset($fieldset_content['form']['tabs']['main']['fields']) &&
+                        isset($fieldset_content['form']['tabs']['main']['fields']['title'])) {
                         if (isset($fieldset_content['hide']) && $fieldset_content['hide'] == true) {
                             continue;
                         }
@@ -249,9 +249,12 @@ public function addProcess(Request $request, Response $response) : Response
                     $data_from_post['template']   = $template;
                 }
 
+                //foreach ($fieldset['sections'] as $section_name => $section_body) {
+                //    foreach ($section_body['form']['fields'] as $field => $properties) {
+
                 // Predefine data values based on fieldset default values
-                foreach ($fieldset['sections'] as $section_name => $section_body) {
-                    foreach ($section_body['form']['fields'] as $field => $properties) {
+                foreach ($fieldset['form']['tabs'] as $form_tab => $form_tab_body) {
+                    foreach ($form_tab_body['fields'] as $field => $properties) {
 
                         // Ingnore fields where property: heading
                         if ($properties['type'] == 'heading') {
@@ -339,10 +342,10 @@ public function type(Request $request, Response $response) : Response
             foreach ($_fieldsets as $fieldset) {
                 if ($fieldset['type'] == 'file' && $fieldset['extension'] == 'yaml') {
                     $fieldset_content = $this->serializer->decode(Filesystem::read($fieldset['path']), 'yaml');
-                    if (isset($fieldset_content['sections']) &&
-                        isset($fieldset_content['sections']['main']) &&
-                        isset($fieldset_content['sections']['main']['form']['fields']) &&
-                        isset($fieldset_content['sections']['main']['form']['fields']['title'])) {
+                    if (isset($fieldset_content['form']) &&
+                        isset($fieldset_content['form']['tabs']['main']) &&
+                        isset($fieldset_content['form']['tabs']['main']['fields']) &&
+                        isset($fieldset_content['form']['tabs']['main']['fields']['title'])) {
                         if (isset($fieldset_content['hide']) && $fieldset_content['hide'] == true) {
                             continue;
                         }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Admin",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Admin theme for Flextype",
   "homepage": "http://flextype.org",
   "author": "Sergey Romanenko",

plugin.yaml

@@ -1,5 +1,5 @@
 name: Admin
-version: 1.0.5
+version: 1.0.6
 description: Admin Panel plugin for Flextype.
 icon: fab fa-fort-awesome
 author:

routes/web.php

@@ -10,7 +10,7 @@
     $app->post('/installation', 'UsersController:installationProcess')->setName('admin.users.installationProcess');
     $app->get('/login', 'UsersController:login')->setName('admin.users.login');
     $app->post('/login', 'UsersController:loginProcess')->setName('admin.users.loginProcess');
-});
+})->add('csrf');
 
 $app->group('/' . $admin_route, function () use ($app) : void {
     // Dashboard
@@ -98,4 +98,4 @@
     $app->post('/api/management/entries/edit', 'ApiManagementEntriesController:editProcess')->setName('admin.api_management_entries.editProcess');
     $app->post('/api/management/entries/delete', 'ApiManagementEntriesController:deleteProcess')->setName('admin.api_management_entries.deleteProcess');
 
-})->add(new AdminPanelAuthMiddleware($flextype));
+})->add(new AdminPanelAuthMiddleware($flextype))->add('csrf');

templates/content/entries/index.html

@@ -2,7 +2,6 @@
 
 {% block content %}
     {% if fieldsets | length > 0 %}
-
         {% if entries_list | length > 0 %}
             {% if items_view == 'table' %}
                 <div class="flex flex-wrap">