IntenseFinance/firefly-iii
3
0 Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-10-25 14:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix tags input.

Browse Source
This commit is contained in:
James Cole committed 2026-07-24 10:11:12 +02:00
1 parent 8a0a4c226f
commit 06e303fb1b
6 files changed
+52 -73
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

package-lock.json
Generated
+22 -27
View File
@@ -8,7 +8,9 @@
"resources/assets/v1",
"resources/assets/v3"
],
"devDependencies": {}
"dependencies": {
"bootstrap5-tags": "^1.7.17"
}
},
"node_modules/@babel/code-frame": {
"version": "7.29.7",
@@ -3613,9 +3615,9 @@
"license": "MIT"
},
"node_modules/baseline-browser-mapping": {
"version": "2.11.0",
"resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.0.tgz",
"integrity": "sha512-oCu2wfipvX3AePSgmOuKkIywOu+8n9psz7hXYmk56ghpu3+7KzNIBopaOs4c9BrtdnTtW30unG9GTfHo7EwERQ==",
"version": "2.11.1",
"resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.1.tgz",
"integrity": "sha512-HYXq73DDpCtNzOmrFsm9eSwCvWCql0RzqjpDzXN9EadiLJ4DNat0nsZ/Bzmy+Ud12mb4/zKDY0cQ805ZzN+i0A==",
"dev": true,
"license": "Apache-2.0",
"bin": {
@@ -3893,9 +3895,9 @@
}
},
"node_modules/browserslist": {
"version": "4.28.6",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.6.tgz",
"integrity": "sha512-FQBYNK15VMslhLHpA7+n+n1GOlF1kId2xcCg7/j95f24AOF6VDYMNH4mFxF7KuaTdv627faazpOAjFzMrfJOUw==",
"version": "4.28.7",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.7.tgz",
"integrity": "sha512-JxV13hNrFxqjOc8alRbq9dK1MM79NEXYpma2B2J4wAtpWS5zIEIKqWPGCl7N4o7Uc7B7itylh7SuDujATRyyTw==",
"dev": true,
"funding": [
{
@@ -3913,9 +3915,9 @@
],
"license": "MIT",
"dependencies": {
"baseline-browser-mapping": "^2.10.42",
"caniuse-lite": "^1.0.30001803",
"electron-to-chromium": "^1.5.389",
"baseline-browser-mapping": "^2.10.44",
"caniuse-lite": "^1.0.30001806",
"electron-to-chromium": "^1.5.393",
"node-releases": "^2.0.51",
"update-browserslist-db": "^1.2.3"
},
@@ -5261,9 +5263,9 @@
"license": "MIT"
},
"node_modules/electron-to-chromium": {
"version": "1.5.394",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.394.tgz",
"integrity": "sha512-Wmt2Gm0o8JWBuGgmc4XZ0u9s1RaCRqhxP47phplmfg04+qypTUurpeJGP45A7Fhv7jdrrVH44PLlR9qXo37cVQ==",
"version": "1.5.396",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.396.tgz",
"integrity": "sha512-yHiw2Y3C3H9U6TMbOfoWK/BPreiOPXRfTWPBwQBoZG6/8TB6eOPnsy5oaRYuatR7Fw2SJ4kKforgufeo7fq0EQ==",
"dev": true,
"license": "ISC"
},
@@ -8732,9 +8734,9 @@
}
},
"node_modules/postcss": {
"version": "8.5.21",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.21.tgz",
"integrity": "sha512-v4sDNP3fdNiWMfabO7OwOQdOX8TiQSztKyT1Wj0w+j7LDallJThJRBBBmzVGyYj0crMh7jlV4zepPkiNu9UwDQ==",
"version": "8.5.22",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.22.tgz",
"integrity": "sha512-KBDEIpLrvpv16pp3K0Fw+UCoZfopFjjgeB+0tA/aaThfEE74kKDLrgg603YvOWJyg3+WYtyq3xYsQWsIyZlPqQ==",
"dev": true,
"funding": [
{
@@ -9952,9 +9954,9 @@
"license": "MIT"
},
"node_modules/sass": {
"version": "1.101.3",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.101.3.tgz",
"integrity": "sha512-Z1lLHhtAII+dyLNIQB6JQTZMy7sDxk3f5NzbINRc9ks1P0HCGvSuKev0wUhULFpLSaHBIMZrcTs9WDQUZerrgA==",
"version": "1.101.7",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.101.7.tgz",
"integrity": "sha512-cDeUYU0dhwKVbpYg/ppsjyuoddxYhWlJOkRoI7+/iZsaSp7iowWDfm+tL2HcUafedWBDvbf/+hx0QRgKG4JSHA==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -11226,12 +11228,6 @@
"node": ">= 0.4"
}
},
"node_modules/use-bootstrap-tag": {
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/use-bootstrap-tag/-/use-bootstrap-tag-2.2.2.tgz",
"integrity": "sha512-9ny8LwuYCCeqgIdC50wfzaUZC5ELJfnQvoiukKGxDkxlss3sX1d5MXtJ5Whi00TseFA6g0I9fW/9f0eIgIWVLQ==",
"license": "MIT"
},
"node_modules/util": {
"version": "0.11.1",
"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
@@ -12285,8 +12281,7 @@
"i18next-localstorage-backend": "^4.2.0",
"patch-package": "^8.0.1",
"shepherd.js": "^15.2.2",
"store": "^2.0.12",
"use-bootstrap-tag": "^2.2.2"
"store": "^2.0.12"
},
"devDependencies": {
"concurrently": "^10",
package.json
+2 -7
View File
@@ -1,15 +1,10 @@
{
"scripts": {
},
"scripts": {},
"workspaces": [
"resources/assets/v1",
"resources/assets/v3"
],
"devDependencies": {
},
"dependencies": {
"bootstrap5-tags": "^1.7.17"
}
}
public/v1/js/ff/recurring/create.js
+2 -2
View File
@@ -25,8 +25,8 @@ var calendar;
$(document).ready(function () {
"use strict";
$(".content-wrapper form input:enabled:visible:first").first().focus().select();
initializeButtons();
initializeAutoComplete();
// initializeButtons();
// initializeAutoComplete();
// respondToFirstDateChange();
// respondToRepetitionEnd();
// $('.switch-button').on('click', switchTransactionType);
resources/assets/v3/js/pages/recurring/create.js
+23 -34
View File
@@ -22,19 +22,38 @@ import '../../boot/bootstrap.js';
import sidebar from '../../pages/shared/sidebar.js';
import dates from '../shared/dates.js';
import Autocomplete from "bootstrap5-autocomplete";
import 'use-bootstrap-tag/dist/use-bootstrap-tag.css'
import UseBootstrapTag from 'use-bootstrap-tag'
import Tags from "bootstrap5-tags";
let create = function () {
return {
init() {
console.log('Init recurring create');
this.createTagField();
this.createAutocomplete();
},
createTagField(){
UseBootstrapTag(document.getElementById('ffInput_tags'));
let token = document.querySelector('meta[name="csrf-token"]').getAttribute('content');
Tags.init('#ffInput_tags',
{
allowNew: true,
allowClear: true,
server: './api/v1/autocomplete/tags?_token=' + token,
liveServer: true,
labelField: 'name',
valueField: 'name',
fetchOptions: {
method: 'GET',
credentials: 'include',
headers: {
'Content-Type': 'application/json',
'Accept': 'application/json',
'X-CSRF-TOKEN': token
}
}
}
);
},
createAutocomplete() {
this.createCategoryAutocomplete();
@@ -56,36 +75,6 @@ let create = function () {
'X-CSRF-TOKEN': token
}
}
// onServerResponse: function(data) {
// console.log(data.body);
// return Promise.resolve(data);
// },
//
// fetchFunction: function (query) {
// // Custom data fetching logic
// return fetch('api/v1/autocomplete/categories?_token=' + token + '&query=' + encodeURIComponent(query),
// {
// method: 'GET',
// credentials: 'include',
// headers: {
// 'Content-Type': 'application/json',
// 'Accept': 'application/json',
// 'X-CSRF-TOKEN': token
// },
// }
// )
// .then((response) => response.json())
// .then((data) => {
// var result = [];
// for(var i in data) {
// if(data.hasOwnProperty(i)) {
// result.push(data[i].name);
// }
// }
// // Process data if needed
// return result;
// });
// },
});
},
}
resources/assets/v3/package.json
+1 -2
View File
@@ -20,8 +20,7 @@
"i18next-localstorage-backend": "^4.2.0",
"patch-package": "^8.0.1",
"shepherd.js": "^15.2.2",
"store": "^2.0.12",
"use-bootstrap-tag": "^2.2.2"
"store": "^2.0.12"
},
"type": "module",
"scripts": {
resources/views/recurring/create.blade.php
+2 -1
View File
@@ -146,7 +146,8 @@
@endif
{{-- TAGS --}}
{!! ExpandedForm::text('tags') !!}
{{-- ExpandedForm::text('tags') --}}
{!! ExpandedForm::multiSelect('tags', [],null, ['multiple'=> 'multiple']) !!}
{{-- RELATE THIS TRANSFER TO A PIGGY BANK --}}
{!! PiggyBankForm::piggyBankList('piggy_bank_id') !!}