Fixed error when trying to export when no records exist, Fixed menu c…

…ontext, Fixed main menu counter not updating
gotechdigital · Oct 22, 2022 · d22c328 · d22c328
1 parent 8f1e4ef
commit d22c328
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/controllers/Exports.php b/controllers/Exports.php
@@ -21,7 +21,7 @@ class Exports extends Controller {
 
     public function __construct() {
         parent::__construct();
-        BackendMenu::setContext('blakejones.magicforms', 'forms', 'exports');
+        BackendMenu::setContext('BlakeJones.MagicForms', 'forms', 'exports');
     }
 
     public function index() {
@@ -84,7 +84,9 @@ public function csv() {
         $filteredRecords = $records->get();
         $recordsArray = $filteredRecords->toArray();
         $record = $filteredRecords->first();
-        $headers = array_merge($headers, array_keys($record->form_data_arr));
+        if (isset($record)) {
+            $headers = array_merge($headers, array_keys($record->form_data_arr));
+        }
 
         // ADD HEADERS
         $csv->insertOne($headers);

diff --git a/controllers/Records.php b/controllers/Records.php
@@ -23,7 +23,7 @@ class Records extends Controller {
 
         public function __construct() {
             parent::__construct();
-            BackendMenu::setContext('blakejones.magicforms', 'forms', 'records');
+            BackendMenu::setContext('BlakeJones.MagicForms', 'forms', 'records');
         }
 
         public function view($id) {

diff --git a/controllers/records/partials/_list_toolbar.htm b/controllers/records/partials/_list_toolbar.htm
@@ -17,6 +17,7 @@
                     'interval': 3
                 });
                 $.oc.sideNav.setCounter('forms/records', data.counter);
+                $.oc.sideNav.setCounter('forms', data.counter);
                 $('#Lists').html(data.list['#Lists']);
             ",
         ]);
@@ -35,6 +36,7 @@
             'request_success' => "
                 $('#records-toolbar').find('button').prop('disabled', true);
                 $.oc.sideNav.setCounter('forms/records', data.counter);
+                $.oc.sideNav.setCounter('forms', data.counter);
                 $('#Lists').html(data.list['#Lists']);
             ",
         ]);
@@ -50,6 +52,7 @@
             'request_success' => "
                 $('#records-toolbar').find('button').prop('disabled', true);
                 $.oc.sideNav.setCounter('forms/records', data.counter);
+                $.oc.sideNav.setCounter('forms', data.counter);
                 $('#Lists').html(data.list['#Lists']);
             ",
         ]);
@@ -67,6 +70,7 @@
                 'request_success' => "
                     $('#records-toolbar').find('button').blur();
                     $.oc.sideNav.setCounter('forms/records', data.counter);
+                    $.oc.sideNav.setCounter('forms', data.counter);
                     $('#Lists').html(data.list['#Lists']);
                 ",
             ]);

diff --git a/updates/version.yaml b/updates/version.yaml
@@ -136,4 +136,6 @@
 1.6.2:
     - Fixed getting total count of records preventing install because the records table doesn't exist
 1.6.3:
-    - Fixed needed use Schema for UnreadRecords class
+    - Fixed needed use Schema for UnreadRecords class
+1.6.4:
+    - Fixed error when trying to export when no records exist, Fixed menu context, Fixed main menu counter not updating