gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 38201: Remove redundant code from base-resource.js and resolve additionalFilter error 

Signed-off-by: Michaela Sieber <michaela.sieber@kit.edu>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
This commit is contained in:
Matt Blenkinsop 2025-09-12 13:11:29 +01:00 committed by Lucas Gass
parent d93e01850a
commit 694c87bfb4
No known key found for this signature in database
GPG Key ID: 60B447398B0D36CA
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
koha-tmpl/intranet-tmpl/prog/js/vue/composables/base-resource.js
View File

@ -74,9 +74,6 @@ export function useBaseResource(resourceConfig) {
let i18n = resourceConfig.i18n;
const format_date = $date;
const patron_to_html = $patron_to_html;
/**
**********************************************************************
* TOOLBAR RELATED METHODS
@ -334,10 +331,10 @@ export function useBaseResource(resourceConfig) {
* @return {Object}
*/
const getFilterValues = (query, filterData = []) => {
const filters = filterData
const filters = filterData.length
? filterData
: resourceConfig.table.filters
? resourceConfig.table.filters
: resourceConfig.table.additionalFilters
? resourceConfig.table.additionalFilters
: [];
const filterOptions = filters.reduce((acc, filter) => {
acc[filter.name] = filter.value;
@ -360,6 +357,8 @@ export function useBaseResource(resourceConfig) {
/**
* Gets the label to display before the filters in the List component
* This is a default method that returns an empty string.
* It can be overridden at the resource level if filters are required
*
* @return {String} The label
*/
@ -649,13 +648,6 @@ export function useBaseResource(resourceConfig) {
attr.selectLabel = "description";
}
}
if (attr.type == "relationship" && attr.componentProps) {
Object.keys(attr.componentProps).forEach(key => {
if (attr.componentProps[key].type == "av") {
attr.componentProps[key].av = authorisedValues[key];
}
});
}
if (attr.relationshipFields?.length) {
populateAttributesWithAuthorisedValues(attr.relationshipFields);
}
@ -709,8 +701,6 @@ export function useBaseResource(resourceConfig) {
setMessage,
setError,
setWarning,
format_date,
patron_to_html,
build_url,
route,
router,