Skip to content

Firefly III: a personal finances manager

Fix #12922 and fix #12928

James Cole47b484257614
diff --git a/app/Http/Controllers/Report/BudgetController.php b/app/Http/Controllers/Report/BudgetController.php
index 42b38a814b..7b9511f876 100644
--- a/app/Http/Controllers/Report/BudgetController.php
+++ b/app/Http/Controllers/Report/BudgetController.php
@@ -169,9 +169,10 @@ final class BudgetController extends Controller
// sort temp array by amount.
$amounts = array_column($result, 'avg_float');
array_multisort($amounts, SORT_ASC, $result);
+ $incomeTopLength = count(array_keys($result));
try {
- $result = view('reports.budget.partials.avg-expenses', ['result' => $result])->render();
+ $result = view('reports.budget.partials.avg-expenses', ['result' => $result, 'incomeTopLength' => $incomeTopLength])->render();
} catch (Throwable $e) {
Log::error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
$result = sprintf('Could not render view: %s', $e->getMessage());
diff --git a/app/Http/Controllers/Report/CategoryController.php b/app/Http/Controllers/Report/CategoryController.php
index e0466f00cc..d804a717dd 100644
--- a/app/Http/Controllers/Report/CategoryController.php
+++ b/app/Http/Controllers/Report/CategoryController.php
@@ -280,9 +280,10 @@ final class CategoryController extends Controller
// sort temp array by amount.
$amounts = array_column($result, 'avg_float');
array_multisort($amounts, SORT_ASC, $result);
+ $incomeTopLength = count(array_keys($result));
try {
- $result = view('reports.category.partials.avg-expenses', ['result' => $result])->render();
+ $result = view('reports.category.partials.avg-expenses', ['result' => $result, 'incomeTopLength' => $incomeTopLength])->render();
} catch (Throwable $e) {
Log::error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
$result = sprintf('Could not render view: %s', $e->getMessage());
diff --git a/app/Http/Controllers/Report/DoubleController.php b/app/Http/Controllers/Report/DoubleController.php
index e05b82590d..08de552dad 100644
--- a/app/Http/Controllers/Report/DoubleController.php
+++ b/app/Http/Controllers/Report/DoubleController.php
@@ -95,13 +95,14 @@ final class DoubleController extends Controller
$result[$key]['avg_float'] = (float) $result[$key]['avg'];
}
}
+ $incomeTopLength = count(array_keys($result));
// sort by amount_float
// sort temp array by amount.
$amounts = array_column($result, 'avg_float');
array_multisort($amounts, SORT_ASC, $result);
try {
- $result = view('reports.double.partials.avg-expenses', ['result' => $result])->render();
+ $result = view('reports.double.partials.avg-expenses', ['result' => $result, 'incomeTopLength' => $incomeTopLength])->render();
} catch (Throwable $e) {
Log::error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
$result = sprintf('Could not render view: %s', $e->getMessage());
diff --git a/app/Http/Controllers/Report/TagController.php b/app/Http/Controllers/Report/TagController.php
index c006e65aba..f6ecfa4aec 100644
--- a/app/Http/Controllers/Report/TagController.php
+++ b/app/Http/Controllers/Report/TagController.php
@@ -264,7 +264,7 @@ final class TagController extends Controller
}
}
}
- $incomeTopLength = count($result);
+ $incomeTopLength = count(array_keys($result));
// sort by amount_float
// sort temp array by amount.
$amounts = array_column($result, 'avg_float');
diff --git a/changelog.md b/changelog.md
index c21ab81e32..7f74fec93c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,15 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
+## v6.7.7 - 2026-09-30
+
+<!-- summary: This release fixes various bugs in the new layout. -->
+
+### Fixed
+
+- #12928
+- #12922
+
## v6.7.6 - 2026-09-28
### Fixed
diff --git a/resources/assets/v3/js/pages/transactions/shared/autocomplete-functions.js b/resources/assets/v3/js/pages/transactions/shared/autocomplete-functions.js
index 011624ee80..910a21c772 100644
--- a/resources/assets/v3/js/pages/transactions/shared/autocomplete-functions.js
+++ b/resources/assets/v3/js/pages/transactions/shared/autocomplete-functions.js
@@ -37,9 +37,11 @@ export function changeDescription(item, ac) {
}
export function changeDestinationAccount(item, ac) {
+ console.log('changeDestinationAccount', item, ac);
if (typeof item === "object") {
// changed account but did not select.
- const index = parseInt(ac._searchInput.attributes["data-index"].value);
+ const index = parseInt(ac._searchInput.dataset.index);
+ console.log('changeDestinationAccount X', document.querySelector("#form"));
document.querySelector("#form")._x_dataStack[0].$data.entries[index].destination_account = {
id: item.id,
name: item.name,
@@ -51,7 +53,7 @@ export function changeDestinationAccount(item, ac) {
document.querySelector("#form")._x_dataStack[0].changedDestinationAccount();
}
if (typeof item === "undefined") {
- const index = parseInt(ac._searchInput.attributes["data-index"].value);
+ const index = parseInt(ac._searchInput.dataset.index);
let destination = document.querySelector("#form")._x_dataStack[0].$data.entries[index].destination_account;
if (destination.name === ac._searchInput.value) {
console.warn('Ignore hallucinated destination account name change to "' + ac._searchInput.value + '"');
@@ -67,6 +69,7 @@ export function changeDestinationAccount(item, ac) {
export function selectDestinationAccount(item, ac) {
const index = parseInt(ac._searchInput.attributes["data-index"].value);
+ console.log('selectDestinationAccount', index);
document.querySelector("#form")._x_dataStack[0].$data.entries[index].destination_account = {
id: item.id,
name: item.name,
diff --git a/resources/assets/v3/js/pages/transactions/shared/keyup-from-destination.js b/resources/assets/v3/js/pages/transactions/shared/keyup-from-destination.js
index 7aff78c639..c9ac806610 100644
--- a/resources/assets/v3/js/pages/transactions/shared/keyup-from-destination.js
+++ b/resources/assets/v3/js/pages/transactions/shared/keyup-from-destination.js
@@ -23,4 +23,5 @@ export function keyUpFromDestination(e) {
if ("Enter" === e.key && 'UL' === target.nodeName && !target.classList.contains("show")) {
this.save();
}
+
}
diff --git a/resources/assets/v3/js/pages/webhooks/create.js b/resources/assets/v3/js/pages/webhooks/create.js
index 47348d65a7..9cf1979269 100644
--- a/resources/assets/v3/js/pages/webhooks/create.js
+++ b/resources/assets/v3/js/pages/webhooks/create.js
@@ -53,7 +53,7 @@ let create = function () {
},
},
triggers: ["ANY"],
- responses: ["RELEVANT"],
+ responses: "RELEVANT",
deliveries: ["JSON"],
active: true,
url: "",
@@ -114,7 +114,7 @@ let create = function () {
let data = {
title: this.title,
triggers: this.triggers,
- responses: this.responses,
+ responses: [this.responses],
deliveries: this.deliveries,
url: this.url,
active: this.active,
diff --git a/resources/views/administrations/edit.blade.php b/resources/views/administrations/edit.blade.php
index 9a6566b0e8..2e0675a6d6 100644
--- a/resources/views/administrations/edit.blade.php
+++ b/resources/views/administrations/edit.blade.php
@@ -8,9 +8,8 @@
<div class="row">
<div class="col-lg-12">
<div class="alert alert-danger alert-dismissible" role="alert">
- <button class="close" data-bs-dismiss="alert" type="button" aria-label="{{ __('firefly.close') }}"><span
- aria-hidden="true">&times;</span></button>
<strong>{{ __("firefly.flash_error") }}</strong> <span x-text="error_message"></span>
+ <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="{{ __('firefly.close') }}"></button>
</div>
</div>
</div>
@@ -20,8 +19,8 @@
<div class="row">
<div class="col-lg-12">
<div class="alert alert-success alert-dismissible" role="alert">
- <button class="close" data-bs-dismiss="alert" type="button" aria-label="{{ __('firefly.close') }}"><span aria-hidden="true">&times;</span></button>
<strong>{{ __("firefly.flash_success") }}</strong> <span x-html="success_message"></span>
+ <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="{{ __('firefly.close') }}"></button>
</div>
</div>
</div>
diff --git a/resources/views/components/form/alpine/responses.blade.php b/resources/views/components/form/alpine/responses.blade.php
index 86a95145e3..1ff33da506 100644
--- a/resources/views/components/form/alpine/responses.blade.php
+++ b/resources/views/components/form/alpine/responses.blade.php
@@ -22,7 +22,6 @@
x-bind:class="{'form-select': true, 'is-invalid': errors.responses.length > 0}"
name="responses[]"
@input="handleInput">
- <option value="invlaid">bla</option>
<template x-for="response in options.responses">
<option :label="response.name" :selected="responses.includes(response.id)" :value="response.id"
x-text="response.name"></option>
diff --git a/resources/views/partials/form/transaction/destination-account.blade.php b/resources/views/partials/form/transaction/destination-account.blade.php
index 6025a3bf37..5fe2a1f434 100644
--- a/resources/views/partials/form/transaction/destination-account.blade.php
+++ b/resources/views/partials/form/transaction/destination-account.blade.php
@@ -23,7 +23,7 @@
x-bind:disabled="true===transaction.destination_account.disabled"
x-bind:readonly="true===transaction.destination_account.disabled"
placeholder="{{ __('firefly.destination_account') }}">
- <button tabindex="-1" class="btn btn-outline-secondary" type="button" @click="clearDestinationAccount(index)"><em class="bi bi-trash"></em></button>
+ <button x-bind:disabled="true===transaction.destination_account.disabled" tabindex="-1" class="btn btn-outline-secondary" type="button" @click="clearDestinationAccount(index)"><em class="bi bi-trash"></em></button>
</div>
</template>
<template x-if="true===transaction.destination_account.disabled">
diff --git a/resources/views/webhooks/create.blade.php b/resources/views/webhooks/create.blade.php
index d7b593ee1b..510112dec9 100644
--- a/resources/views/webhooks/create.blade.php
+++ b/resources/views/webhooks/create.blade.php
@@ -8,9 +8,8 @@
<div class="row">
<div class="col-lg-12">
<div class="alert alert-danger alert-dismissible" role="alert">
- <button class="close" data-bs-dismiss="alert" type="button" aria-label="{{ __('firefly.close') }}"><span
- aria-hidden="true">&times;</span></button>
<strong>{{ __("firefly.flash_error") }}</strong> <span x-text="error_message"></span>
+ <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="{{ __('firefly.close') }}"></button>
</div>
</div>
</div>
@@ -20,9 +19,8 @@
<div class="row">
<div class="col-lg-12">
<div class="alert alert-success alert-dismissible" role="alert">
- <button class="close" data-bs-dismiss="alert" type="button" aria-label="{{ __('firefly.close') }}"><span
- aria-hidden="true">&times;</span></button>
<strong>{{ __("firefly.flash_success") }}</strong> <span x-html="success_message"></span>
+ <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="{{ __('firefly.close') }}"></button>
</div>
</div>
</div>
diff --git a/resources/views/webhooks/edit.blade.php b/resources/views/webhooks/edit.blade.php
index 4fc2697479..254dc8f91a 100644
--- a/resources/views/webhooks/edit.blade.php
+++ b/resources/views/webhooks/edit.blade.php
@@ -8,10 +8,8 @@
<div class="row">
<div class="col-lg-12">
<div class="alert alert-danger alert-dismissible" role="alert">
- <button class="close" data-bs-dismiss="alert" type="button"
- v-bind:aria-label="i18next.t('firefly.close')"><span
- aria-hidden="true">&times;</span></button>
<strong>{{ __("firefly.flash_error") }}</strong> <span x-text="error_message"></span>
+ <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="{{ __('firefly.close') }}"></button>
</div>
</div>
</div>
@@ -21,10 +19,8 @@
<div class="row">
<div class="col-lg-12">
<div class="alert alert-success alert-dismissible" role="alert">
- <button class="close" data-bs-dismiss="alert" type="button"
- v-bind:aria-label="i18next.t('firefly.close')"><span
- aria-hidden="true">&times;</span></button>
<strong>{{ __("firefly.flash_success") }}</strong> <span x-html="success_message"></span>
+ <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="{{ __('firefly.close') }}"></button>
</div>
</div>
</div>