From d03ca0ec362676f4f749ee73a62d082fef5b35b9 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Thu, 1 Oct 2020 17:02:15 +0200
Subject: [PATCH] Some bug fixes.

---
 app/Http/Controllers/Rule/EditController.php         |  2 +-
 app/Support/Http/Controllers/RuleManagement.php      |  2 +-
 frontend/src/components/accounts/List.vue            | 12 ++++++------
 frontend/src/components/dashboard/MainBillsList.vue  |  6 +++---
 frontend/src/components/dashboard/MainPiggyList.vue  |  6 +++---
 .../components/transactions/TransactionListLarge.vue | 10 +++++-----
 .../transactions/TransactionListMedium.vue           |  6 +++---
 .../components/transactions/TransactionListSmall.vue |  4 ++--
 .../js/components/passport/AuthorizedClients.vue     |  6 +++---
 resources/assets/js/components/passport/Clients.vue  | 10 +++++-----
 .../js/components/passport/PersonalAccessTokens.vue  |  4 ++--
 11 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/app/Http/Controllers/Rule/EditController.php b/app/Http/Controllers/Rule/EditController.php
index 55f6a561c6..0891804279 100644
--- a/app/Http/Controllers/Rule/EditController.php
+++ b/app/Http/Controllers/Rule/EditController.php
@@ -192,7 +192,7 @@ class EditController extends Controller
                     [
                         'oldTrigger' => OperatorQuerySearch::getRootOperator($operator['type']),
                         'oldValue'   => $operator['value'],
-                        'oldChecked' => 1 === (int) ($oldTrigger['stop_processing'] ?? '0'),
+                        'oldChecked' => false,
                         'count'      => $index + 1,
                         'triggers'   => $triggers,
                     ]
diff --git a/app/Support/Http/Controllers/RuleManagement.php b/app/Support/Http/Controllers/RuleManagement.php
index d4d98886bb..3045007815 100644
--- a/app/Support/Http/Controllers/RuleManagement.php
+++ b/app/Support/Http/Controllers/RuleManagement.php
@@ -62,7 +62,7 @@ trait RuleManagement
                     [
                         'oldTrigger' => OperatorQuerySearch::getRootOperator($operator['type']),
                         'oldValue'   => $operator['value'],
-                        'oldChecked' => 1 === (int) ($oldTrigger['stop_processing'] ?? '0'),
+                        'oldChecked' => false,
                         'count'      => $index + 1,
                         'triggers'   => $triggers,
                     ]
diff --git a/frontend/src/components/accounts/List.vue b/frontend/src/components/accounts/List.vue
index 1c3f9cccbb..778b453713 100644
--- a/frontend/src/components/accounts/List.vue
+++ b/frontend/src/components/accounts/List.vue
@@ -52,12 +52,12 @@
                     <table class="table table-sm table-striped">
                         <thead>
                         <tr>
-                            <th>&nbsp;</th>
-                            <th>{{ $t('list.name') }}</th>
-                            <th v-if="'asset' === $props.accountTypes">{{ $t('list.role') }}</th>
-                            <th>{{ $t('list.iban') }}</th>
-                            <th style="text-align: right;">{{ $t('list.currentBalance') }}</th>
-                            <th>{{ $t('list.balanceDiff') }}</th>
+                            <th scope="col">&nbsp;</th>
+                            <th scope="col">{{ $t('list.name') }}</th>
+                            <th scope="col" v-if="'asset' === $props.accountTypes">{{ $t('list.role') }}</th>
+                            <th scope="col">{{ $t('list.iban') }}</th>
+                            <th scope="col" style="text-align: right;">{{ $t('list.currentBalance') }}</th>
+                            <th scope="col">{{ $t('list.balanceDiff') }}</th>
                         </tr>
                         </thead>
                         <tbody>
diff --git a/frontend/src/components/dashboard/MainBillsList.vue b/frontend/src/components/dashboard/MainBillsList.vue
index ac4915a6d1..a704eb77a2 100644
--- a/frontend/src/components/dashboard/MainBillsList.vue
+++ b/frontend/src/components/dashboard/MainBillsList.vue
@@ -27,9 +27,9 @@
             <table class="table table-striped">
                 <thead>
                 <tr>
-                    <th style="width:35%;">{{ $t('list.name') }}</th>
-                    <th style="width:40%;">{{ $t('list.amount') }}</th>
-                    <th style="width:25%;">{{ $t('list.next_expected_match') }}</th>
+                    <th scope="col" style="width:35%;">{{ $t('list.name') }}</th>
+                    <th scope="col" style="width:40%;">{{ $t('list.amount') }}</th>
+                    <th scope="col" style="width:25%;">{{ $t('list.next_expected_match') }}</th>
                 </tr>
                 </thead>
                 <tbody>
diff --git a/frontend/src/components/dashboard/MainPiggyList.vue b/frontend/src/components/dashboard/MainPiggyList.vue
index d2c06eb337..d6bf6ea384 100644
--- a/frontend/src/components/dashboard/MainPiggyList.vue
+++ b/frontend/src/components/dashboard/MainPiggyList.vue
@@ -27,9 +27,9 @@
             <table class="table table-striped">
                 <thead>
                 <tr>
-                    <th style="width:35%;">{{ $t('list.piggy_bank') }}</th>
-                    <th style="width:40%;">{{ $t('list.percentage') }}</th>
-                    <th style="width:25%;text-align: right;">{{ $t('list.amount') }}</th>
+                    <th scope="col" style="width:35%;">{{ $t('list.piggy_bank') }}</th>
+                    <th scope="col" style="width:40%;">{{ $t('list.percentage') }}</th>
+                    <th scope="col" style="width:25%;text-align: right;">{{ $t('list.amount') }}</th>
                 </tr>
                 </thead>
                 <tbody>
diff --git a/frontend/src/components/transactions/TransactionListLarge.vue b/frontend/src/components/transactions/TransactionListLarge.vue
index 6b50842984..e11fa90cb1 100644
--- a/frontend/src/components/transactions/TransactionListLarge.vue
+++ b/frontend/src/components/transactions/TransactionListLarge.vue
@@ -23,11 +23,11 @@
         <caption style="display:none;">{{ $t('firefly.transaction_table_description') }}</caption>
         <thead>
         <tr>
-            <th class="text-left">{{ $t('firefly.description') }}</th>
-            <th>{{ $t('firefly.opposing_account') }}</th>
-            <th class="text-right">{{ $t('firefly.amount') }}</th>
-            <th>{{ $t('firefly.category') }}</th>
-            <th>{{ $t('firefly.budget') }}</th>
+            <th scope="col" class="text-left">{{ $t('firefly.description') }}</th>
+            <th scope="col">{{ $t('firefly.opposing_account') }}</th>
+            <th scope="col" class="text-right">{{ $t('firefly.amount') }}</th>
+            <th scope="col">{{ $t('firefly.category') }}</th>
+            <th scope="col">{{ $t('firefly.budget') }}</th>
         </tr>
         </thead>
         <tbody>
diff --git a/frontend/src/components/transactions/TransactionListMedium.vue b/frontend/src/components/transactions/TransactionListMedium.vue
index 6cca8b10e7..7650a1a42b 100644
--- a/frontend/src/components/transactions/TransactionListMedium.vue
+++ b/frontend/src/components/transactions/TransactionListMedium.vue
@@ -23,9 +23,9 @@
         <caption style="display:none;">{{ $t('firefly.transaction_table_description') }}</caption>
         <thead>
         <tr>
-            <th class="text-left">{{ $t('firefly.description') }}</th>
-            <th>{{ $t('firefly.opposing_account') }}</th>
-            <th class="text-right">{{ $t('firefly.amount') }}</th>
+            <th scope="col" class="text-left">{{ $t('firefly.description') }}</th>
+            <th scope="col">{{ $t('firefly.opposing_account') }}</th>
+            <th scope="col" class="text-right">{{ $t('firefly.amount') }}</th>
         </tr>
         </thead>
         <tbody>
diff --git a/frontend/src/components/transactions/TransactionListSmall.vue b/frontend/src/components/transactions/TransactionListSmall.vue
index de6f563151..5e83619085 100644
--- a/frontend/src/components/transactions/TransactionListSmall.vue
+++ b/frontend/src/components/transactions/TransactionListSmall.vue
@@ -23,8 +23,8 @@
         <caption style="display:none;">{{ $t('firefly.transaction_table_description') }}</caption>
         <thead>
         <tr>
-            <th class="text-left">{{ $t('firefly.description') }}</th>
-            <th class="text-right">{{ $t('firefly.amount') }}</th>
+            <th scope="col" class="text-left">{{ $t('firefly.description') }}</th>
+            <th scope="col" class="text-right">{{ $t('firefly.amount') }}</th>
         </tr>
         </thead>
         <tbody>
diff --git a/resources/assets/js/components/passport/AuthorizedClients.vue b/resources/assets/js/components/passport/AuthorizedClients.vue
index b730f69b97..d19079b44a 100644
--- a/resources/assets/js/components/passport/AuthorizedClients.vue
+++ b/resources/assets/js/components/passport/AuthorizedClients.vue
@@ -39,9 +39,9 @@
           <table class="table table-responsive table-borderless mb-0">
             <thead>
             <tr>
-              <th>{{ $t('firefly.name') }}</th>
-              <th>{{ $t('firefly.profile_scopes') }}</th>
-              <th></th>
+              <th scope="col">{{ $t('firefly.name') }}</th>
+              <th scope="col">{{ $t('firefly.profile_scopes') }}</th>
+              <th scope="col"></th>
             </tr>
             </thead>
 
diff --git a/resources/assets/js/components/passport/Clients.vue b/resources/assets/js/components/passport/Clients.vue
index 30b65a8a9d..0dc2c2866b 100644
--- a/resources/assets/js/components/passport/Clients.vue
+++ b/resources/assets/js/components/passport/Clients.vue
@@ -45,11 +45,11 @@
         <caption>{{ $t('firefly.profile_oauth_clients_header') }}</caption>
         <thead>
         <tr>
-          <th>{{ $t('firefly.profile_oauth_client_id') }}</th>
-          <th>{{ $t('firefly.name') }}</th>
-          <th>{{ $t('firefly.profile_oauth_client_secret') }}</th>
-          <th></th>
-          <th></th>
+          <th scope="col">{{ $t('firefly.profile_oauth_client_id') }}</th>
+          <th scope="col">{{ $t('firefly.name') }}</th>
+          <th scope="col">{{ $t('firefly.profile_oauth_client_secret') }}</th>
+          <th scope="col"></th>
+          <th scope="col"></th>
         </tr>
         </thead>
 
diff --git a/resources/assets/js/components/passport/PersonalAccessTokens.vue b/resources/assets/js/components/passport/PersonalAccessTokens.vue
index ccfb358468..e222f56078 100644
--- a/resources/assets/js/components/passport/PersonalAccessTokens.vue
+++ b/resources/assets/js/components/passport/PersonalAccessTokens.vue
@@ -45,8 +45,8 @@
           <table class="table table-responsive table-borderless mb-0" v-if="tokens.length > 0">
             <thead>
             <tr>
-              <th>{{ $t('firefly.name') }}</th>
-              <th></th>
+              <th scope="col">{{ $t('firefly.name') }}</th>
+              <th scope="col"></th>
             </tr>
             </thead>