Bugzilla – Attachment 180700 Details for
Bug 37930
Change how we handle authorised values in Vue
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 37930: Extend new AV logic to the rest of ERM
Bug-37930-Extend-new-AV-logic-to-the-rest-of-ERM.patch (text/plain), 29.69 KB, created by
Matt Blenkinsop
on 2025-04-07 16:24:19 UTC
(
hide
)
Description:
Bug 37930: Extend new AV logic to the rest of ERM
Filename:
MIME Type:
Creator:
Matt Blenkinsop
Created:
2025-04-07 16:24:19 UTC
Size:
29.69 KB
patch
obsolete
>From 3d37b4dbd38ce465333ebeb34ba720d4515e5bb4 Mon Sep 17 00:00:00 2001 >From: Matt Blenkinsop <matt.blenkinsop@openfifth.co.uk> >Date: Mon, 7 Apr 2025 16:25:56 +0100 >Subject: [PATCH] Bug 37930: Extend new AV logic to the rest of ERM > >--- > .../js/vue/components/ERM/AgreementsShow.vue | 4 +- > .../ERM/EHoldingsEBSCOPackageTitlesList.vue | 10 ++--- > .../ERM/EHoldingsEBSCOPackagesList.vue | 24 +++--------- > .../ERM/EHoldingsEBSCOPackagesShow.vue | 4 +- > .../ERM/EHoldingsEBSCOTitlesList.vue | 17 ++++---- > .../ERM/EHoldingsEBSCOTitlesShow.vue | 4 +- > .../ERM/EHoldingsLocalPackageTitlesList.vue | 4 +- > .../ERM/EHoldingsLocalPackagesFormAdd.vue | 14 +++---- > .../ERM/EHoldingsLocalPackagesList.vue | 4 +- > .../ERM/EHoldingsLocalPackagesShow.vue | 4 +- > .../ERM/EHoldingsLocalTitlesFormAdd.vue | 12 +++--- > .../ERM/EHoldingsLocalTitlesList.vue | 6 +-- > .../ERM/EHoldingsLocalTitlesShow.vue | 4 +- > .../js/vue/components/ERM/LicensesFormAdd.vue | 15 +++---- > .../js/vue/components/ERM/LicensesList.vue | 4 +- > .../js/vue/components/ERM/LicensesShow.vue | 4 +- > ...UsageStatisticsDataProvidersFileImport.vue | 3 -- > .../UsageStatisticsDataProvidersFormAdd.vue | 8 ++-- > .../ERM/UsageStatisticsDataProvidersList.vue | 4 +- > .../ERM/UsageStatisticsDataProvidersShow.vue | 4 +- > .../UsageStatisticsDataProvidersSummary.vue | 4 +- > .../ERM/UsageStatisticsReportBuilder.vue | 39 ++++++++----------- > 22 files changed, 85 insertions(+), 111 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue >index 1555fb671e6..e096ec4f884 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue >@@ -354,8 +354,8 @@ export default { > > const { setConfirmationDialog, setMessage } = inject("mainStore"); > >- const AVStore = inject("AVStore"); >- const { get_lib_from_av } = AVStore; >+ const ERMStore = inject("ERMStore"); >+ const { get_lib_from_av } = ERMStore; > > return { > format_date, >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageTitlesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageTitlesList.vue >index 59a1dc26ab4..e6a20358208 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageTitlesList.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageTitlesList.vue >@@ -26,7 +26,7 @@ > > > <option value="">{{ $__("All") }}</option> > <option >- v-for="type in av_title_publication_types" >+ v-for="type in authorisedValues.av_title_publication_types" > :key="type.value" > :value="type.value" > > >@@ -66,9 +66,9 @@ import KohaTable from "../KohaTable.vue"; > > export default { > setup() { >- const AVStore = inject("AVStore"); >- const { av_title_publication_types } = storeToRefs(AVStore); >- const { get_lib_from_av, map_av_dt_filter } = AVStore; >+ const ERMStore = inject("ERMStore"); >+ const { authorisedValues } = storeToRefs(ERMStore); >+ const { get_lib_from_av, map_av_dt_filter } = ERMStore; > > const table = ref(); > const filters = reactive({ >@@ -78,11 +78,11 @@ export default { > }); > > return { >- av_title_publication_types, > get_lib_from_av, > escape_str, > map_av_dt_filter, > table, >+ authorisedValues, > }; > }, > data() { >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesList.vue >index f18cee4cdee..c17c2d88c8f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesList.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesList.vue >@@ -11,11 +11,7 @@ > {{ $__("Content type") }}: > <select id="content_type_filter" v-model="filters.content_type"> > <option value="">{{ $__("All") }}</option> >- <option >- v-for="type in av_package_content_types" >- :key="type.authorised_values" >- :value="type.value" >- > >+ <option :key="type.authorised_values" :value="type.value"> > {{ type.description }} > </option> > </select> >@@ -73,13 +69,9 @@ import KohaTable from "../KohaTable.vue"; > > export default { > setup() { >- const AVStore = inject("AVStore"); >- const { av_package_types, av_package_content_types } = >- storeToRefs(AVStore); >- const { get_lib_from_av, map_av_dt_filter } = AVStore; >- > const ERMStore = inject("ERMStore"); >- const { config } = ERMStore; >+ const { config, get_lib_from_av, map_av_dt_filter } = ERMStore; >+ const { authorisedValues } = storeToRefs(ERMStore); > > const table = ref(); > const filters = reactive({ >@@ -89,13 +81,12 @@ export default { > }); > > return { >- av_package_types, >- av_package_content_types, > get_lib_from_av, > escape_str, > map_av_dt_filter, > config, > table, >+ authorisedValues, > }; > }, > data: function () { >@@ -241,12 +232,7 @@ export default { > searchable: false, > orderable: false, > render: function (data, type, row, meta) { >- return escape_str( >- get_lib_from_av( >- "av_package_content_types", >- row.content_type >- ) >- ); >+ return escape_str(get_lib_from_av(row.content_type)); > }, > }, > ]; >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesShow.vue >index 2bf3b716442..8c6008a8b4e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesShow.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesShow.vue >@@ -122,8 +122,8 @@ export default { > setup() { > const format_date = $date; > >- const AVStore = inject("AVStore"); >- const { get_lib_from_av } = AVStore; >+ const ERMStore = inject("ERMStore"); >+ const { get_lib_from_av } = ERMStore; > > return { > format_date, >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesList.vue >index a40a518ff14..60c4a0a1978 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesList.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesList.vue >@@ -15,7 +15,7 @@ > > > <option value="">{{ $__("All") }}</option> > <option >- v-for="type in av_title_publication_types" >+ v-for="type in authorisedValues.av_title_publication_types" > :key="type.value" > :value="type.value" > > >@@ -77,12 +77,9 @@ import KohaTable from "../KohaTable.vue"; > > export default { > setup() { >- const AVStore = inject("AVStore"); >- const { av_title_publication_types } = storeToRefs(AVStore); >- const { get_lib_from_av } = AVStore; >- > const ERMStore = inject("ERMStore"); >- const { config } = ERMStore; >+ const { authorisedValues } = storeToRefs(ERMStore); >+ const { get_lib_from_av, config } = ERMStore; > > const table = ref(); > const filters = reactive({ >@@ -92,7 +89,7 @@ export default { > }); > > return { >- av_title_publication_types, >+ authorisedValues, > get_lib_from_av, > escape_str, > config, >@@ -123,7 +120,9 @@ export default { > }, > filters_options: { > 1: () => >- this.map_av_dt_filter("av_title_publication_types"), >+ this.map_av_dt_filter( >+ "authorisedValues.av_title_publication_types" >+ ), > }, > actions: { 0: ["show"] }, > default_filters: { >@@ -253,7 +252,7 @@ export default { > render: function (data, type, row, meta) { > return escape_str( > get_lib_from_av( >- "av_title_publication_types", >+ "authorisedValues.av_title_publication_types", > row.publication_type > ) > ); >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesShow.vue >index 2980363b792..125e410d03b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesShow.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesShow.vue >@@ -249,8 +249,8 @@ import { APIClient } from "../../fetch/api-client.js"; > > export default { > setup() { >- const AVStore = inject("AVStore"); >- const { get_lib_from_av } = AVStore; >+ const ERMStore = inject("ERMStore"); >+ const { get_lib_from_av } = ERMStore; > > return { > get_lib_from_av, >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackageTitlesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackageTitlesList.vue >index 9fb46f42e43..d248c2e9239 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackageTitlesList.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackageTitlesList.vue >@@ -10,8 +10,8 @@ import KohaTable from "../KohaTable.vue"; > > export default { > setup() { >- const AVStore = inject("AVStore"); >- const { get_lib_from_av, map_av_dt_filter } = AVStore; >+ const ERMStore = inject("ERMStore"); >+ const { get_lib_from_av, map_av_dt_filter } = ERMStore; > > const table = ref(); > return { >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormAdd.vue >index aacd2ad29df..01798afbcf4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormAdd.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormAdd.vue >@@ -37,7 +37,7 @@ > v-model="erm_package.package_type" > label="description" > :reduce="av => av.value" >- :options="av_package_types" >+ :options="authorisedValues.av_package_types" > /> > </li> > <li> >@@ -49,7 +49,9 @@ > v-model="erm_package.content_type" > label="description" > :reduce="av => av.value" >- :options="av_package_content_types" >+ :options=" >+ authorisedValues.av_package_content_types >+ " > /> > </li> > <li> >@@ -100,13 +102,11 @@ import { storeToRefs } from "pinia"; > > export default { > setup() { >- const AVStore = inject("AVStore"); >- const { av_package_types, av_package_content_types } = >- storeToRefs(AVStore); >+ const ERMStore = inject("ERMStore"); >+ const { authorisedValues } = storeToRefs(ERMStore); > > return { >- av_package_types, >- av_package_content_types, >+ authorisedValues, > }; > }, > data() { >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue >index a1a1ab802f6..58f26069c40 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue >@@ -44,8 +44,8 @@ export default { > const vendorStore = inject("vendorStore"); > const { vendors } = storeToRefs(vendorStore); > >- const AVStore = inject("AVStore"); >- const { get_lib_from_av, map_av_dt_filter } = AVStore; >+ const ERMStore = inject("ERMStore"); >+ const { get_lib_from_av, map_av_dt_filter } = ERMStore; > > const { setConfirmationDialog, setMessage } = inject("mainStore"); > >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue >index 7d85653d709..2a266c6f2a5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue >@@ -133,8 +133,8 @@ export default { > > const { setConfirmationDialog, setMessage } = inject("mainStore"); > >- const AVStore = inject("AVStore"); >- const { get_lib_from_av } = AVStore; >+ const ERMStore = inject("ERMStore"); >+ const { get_lib_from_av } = ERMStore; > > return { > format_date, >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAdd.vue >index 97ac105cefb..e1a2144b826 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAdd.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAdd.vue >@@ -234,7 +234,9 @@ > v-model="title.publication_type" > label="description" > :reduce="av => av.value" >- :options="av_title_publication_types" >+ :options=" >+ authorisedValues.av_title_publication_types >+ " > /> > </li> > >@@ -420,12 +422,12 @@ import { storeToRefs } from "pinia"; > > export default { > setup() { >- const AVStore = inject("AVStore"); >- const { av_title_publication_types } = storeToRefs(AVStore); >- const { get_lib_from_av } = AVStore; >+ const ERMStore = inject("ERMStore"); >+ const { authorisedValues } = storeToRefs(ERMStore); >+ const { get_lib_from_av } = ERMStore; > > return { >- av_title_publication_types, >+ authorisedValues, > get_lib_from_av, > }; > }, >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue >index 46d8bacc1de..96e820f55f6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue >@@ -49,9 +49,8 @@ import KohaTable from "../KohaTable.vue"; > > export default { > setup() { >- const AVStore = inject("AVStore"); >- const { av_title_publication_types } = storeToRefs(AVStore); >- const { get_lib_from_av, map_av_dt_filter } = AVStore; >+ const ERMStore = inject("ERMStore"); >+ const { get_lib_from_av, map_av_dt_filter } = ERMStore; > > const { setConfirmationDialog, setMessage } = inject("mainStore"); > >@@ -62,7 +61,6 @@ export default { > }); > > return { >- av_title_publication_types, > get_lib_from_av, > map_av_dt_filter, > escape_str, >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesShow.vue >index 0875443ceee..4c0d319b2fe 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesShow.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesShow.vue >@@ -271,8 +271,8 @@ import ToolbarButton from "../ToolbarButton.vue"; > > export default { > setup() { >- const AVStore = inject("AVStore"); >- const { get_lib_from_av } = AVStore; >+ const ERMStore = inject("ERMStore"); >+ const { get_lib_from_av } = ERMStore; > const { setConfirmationDialog, setMessage } = inject("mainStore"); > > return { >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue >index c9116a9b8b0..2975f143a64 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue >@@ -53,7 +53,7 @@ > v-model="license.type" > label="description" > :reduce="av => av.value" >- :options="av_license_types" >+ :options="authorisedValues.av_license_types" > > > <template #search="{ attributes, events }"> > <input >@@ -74,7 +74,7 @@ > id="license_status" > v-model="license.status" > :reduce="av => av.value" >- :options="av_license_statuses" >+ :options="authorisedValues.av_license_statuses" > label="description" > > > <template #search="{ attributes, events }"> >@@ -117,7 +117,7 @@ > <UserRoles > :user_type="$__('License user %s')" > :user_roles="license.user_roles" >- :av_user_roles="av_user_roles" >+ :av_user_roles="authorisedValues.av_user_roles" > /> > <Documents :documents="license.documents" /> > <fieldset class="action"> >@@ -151,14 +151,11 @@ import { storeToRefs } from "pinia"; > > export default { > setup() { >- const AVStore = inject("AVStore"); >- const { av_license_types, av_license_statuses, av_user_roles } = >- storeToRefs(AVStore); >+ const ERMStore = inject("ERMStore"); >+ const { authorisedValues } = storeToRefs(ERMStore); > > return { >- av_license_types, >- av_license_statuses, >- av_user_roles, >+ authorisedValues, > max_allowed_packet, > }; > }, >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue >index 2c618e1c775..126b400a651 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue >@@ -38,8 +38,8 @@ export default { > const vendorStore = inject("vendorStore"); > const { vendors } = storeToRefs(vendorStore); > >- const AVStore = inject("AVStore"); >- const { get_lib_from_av, map_av_dt_filter } = AVStore; >+ const ERMStore = inject("ERMStore"); >+ const { get_lib_from_av, map_av_dt_filter } = ERMStore; > > const { setConfirmationDialog, setMessage } = inject("mainStore"); > >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue >index dbfec685309..0d1a4aa0927 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue >@@ -168,8 +168,8 @@ export default { > > const { setConfirmationDialog, setMessage } = inject("mainStore"); > >- const AVStore = inject("AVStore"); >- const { get_lib_from_av } = AVStore; >+ const ERMStore = inject("ERMStore"); >+ const { get_lib_from_av } = ERMStore; > > return { > format_date, >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersFileImport.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersFileImport.vue >index 425ad39baeb..27a06e2d654 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersFileImport.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersFileImport.vue >@@ -41,9 +41,6 @@ import { APIClient } from "../../fetch/api-client.js"; > > export default { > setup() { >- const AVStore = inject("AVStore"); // Left in for future permissions fixes >- const { get_lib_from_av, map_av_dt_filter } = AVStore; >- > const { setMessage } = inject("mainStore"); > > return { >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersFormAdd.vue >index 55e1b95d962..aebcf54092a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersFormAdd.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersFormAdd.vue >@@ -392,11 +392,11 @@ import { storeToRefs } from "pinia"; > > export default { > setup() { >- const AVStore = inject("AVStore"); >- const { av_report_types } = storeToRefs(AVStore); >+ const ERMStore = inject("ERMStore"); >+ const { authorisedValues } = storeToRefs(ERMStore); > > return { >- av_report_types, >+ authorisedValues, > }; > }, > data() { >@@ -425,7 +425,7 @@ export default { > { description: this.$__("Inactive"), value: 0 }, > ], > registry_data: [], >- valid_report_types: [...this.av_report_types], >+ valid_report_types: [...this.authorisedValues.av_report_types], > selected_provider: null, > manual_form: false, > required_fields: [], >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersList.vue >index 406b29729ca..4d08a1da13a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersList.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersList.vue >@@ -42,8 +42,8 @@ import KohaTable from "../KohaTable.vue"; > > export default { > setup() { >- const AVStore = inject("AVStore"); // Left in for future permissions fixes >- const { get_lib_from_av, map_av_dt_filter } = AVStore; >+ const ERMStore = inject("ERMStore"); // Left in for future permissions fixes >+ const { get_lib_from_av, map_av_dt_filter } = ERMStore; > > const { setConfirmationDialog, setMessage, setWarning } = > inject("mainStore"); >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersShow.vue >index 17bdba2d8dc..863bda22e6e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersShow.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersShow.vue >@@ -128,8 +128,8 @@ import UsageStatisticsProviderDataList from "./UsageStatisticsProviderDataList.v > > export default { > setup() { >- const AVStore = inject("AVStore"); >- const { get_lib_from_av } = AVStore; >+ const ERMStore = inject("ERMStore"); >+ const { get_lib_from_av } = ERMStore; > > const { setConfirmationDialog, setMessage } = inject("mainStore"); > >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersSummary.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersSummary.vue >index af7545cc7e7..5e47857de9d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersSummary.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersSummary.vue >@@ -31,8 +31,8 @@ import KohaTable from "../KohaTable.vue"; > > export default { > setup() { >- const AVStore = inject("AVStore"); // Left in for future permissions fixes >- const { get_lib_from_av, map_av_dt_filter } = AVStore; >+ const ERMStore = inject("ERMStore"); // Left in for future permissions fixes >+ const { get_lib_from_av, map_av_dt_filter } = ERMStore; > > const { setConfirmationDialog, setMessage } = inject("mainStore"); > >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsReportBuilder.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsReportBuilder.vue >index 1ab4f6772f3..57ae1cbb68a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsReportBuilder.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsReportBuilder.vue >@@ -364,14 +364,8 @@ import { APIClient } from "../../fetch/api-client.js"; > > export default { > setup() { >- const AVStore = inject("AVStore"); >- const { >- av_report_types, >- av_platform_reports_metrics, >- av_database_reports_metrics, >- av_title_reports_metrics, >- av_item_reports_metrics, >- } = storeToRefs(AVStore); >+ const ERMStore = inject("ERMStore"); >+ const { authorisedValues } = storeToRefs(ERMStore); > > const { setConfirmationDialog, setMessage, setError } = > inject("mainStore"); >@@ -382,11 +376,7 @@ export default { > const title_property_column_options = getColumnOptions(); > > return { >- av_report_types, >- av_platform_reports_metrics, >- av_database_reports_metrics, >- av_title_reports_metrics, >- av_item_reports_metrics, >+ authorisedValues, > setConfirmationDialog, > setMessage, > setError, >@@ -472,7 +462,7 @@ export default { > }, > metric_types_options: [], > access_types_options: [], >- report_types_options: [...this.av_report_types], >+ report_types_options: [...this.authorisedValues.av_report_types], > filter_data: [], > usage_data_provider_list: [...this.usage_data_providers], > time_period_columns_builder: null, >@@ -788,19 +778,22 @@ export default { > if (report_type) { > switch (report_type.substring(0, 1)) { > case "P": >- av_type = this.av_platform_reports_metrics; >+ av_type = >+ this.authorisedValues.av_platform_reports_metrics; > this.data_type = "platform"; > break; > case "T": >- av_type = this.av_title_reports_metrics; >+ av_type = >+ this.authorisedValues.av_title_reports_metrics; > this.data_type = "title"; > break; > case "I": >- av_type = this.av_item_reports_metrics; >+ av_type = this.authorisedValues.av_item_reports_metrics; > this.data_type = "item"; > break; > case "D": >- av_type = this.av_database_reports_metrics; >+ av_type = >+ this.authorisedValues.av_database_reports_metrics; > this.data_type = "database"; > break; > } >@@ -859,7 +852,8 @@ export default { > setReportTypesAndResetFilterData(providers) { > const permittedReportTypes = []; > if (providers.length === 0) { >- this.report_types_options = this.av_report_types; >+ this.report_types_options = >+ this.authorisedValues.av_report_types; > this.query.keywords = null; > this.filter_data.length = 0; > return; >@@ -874,9 +868,10 @@ export default { > single_report_types.pop(); // remove trailing "" from array > > single_report_types.forEach(type => { >- const report_type = this.av_report_types.find( >- rt => rt.value === type >- ); >+ const report_type = >+ this.authorisedValues.av_report_types.find( >+ rt => rt.value === type >+ ); > permittedReportTypes.push(report_type); > }); > // If we change/remove a data provider then we don't want data being displayed from that provider in the dropdown >-- >2.48.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 37930
:
171556
|
171557
|
171558
|
171628
|
172863
|
172864
|
172865
|
172886
|
172887
|
172888
|
172979
|
173069
|
176677
|
176678
|
176679
|
176719
|
176720
|
176721
|
176722
|
176830
|
178248
|
178249
|
178250
|
178251
|
180243
|
180244
|
180245
|
180246
|
180689
|
180698
|
180699
|
180700
|
180701
|
180767
|
180768
|
180769
|
180770
|
180771
|
180772
|
180773
|
180774
|
180775