Bug 38201: Fix: URL param needs to match attr_id

url param needs to match attr_id
usage statistics is non-standard when compared to agreements+licenses etc.
using usage_data_provider_id but resource id field is erm_usage_data_provider_id.
This patch is fixing that.

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:
Pedro Amorim 2024-10-17 15:15:53 +00:00 committed by Lucas Gass
parent 99926859d2
commit bdf83ae5e1
No known key found for this signature in database
GPG Key ID: 60B447398B0D36CA
6 changed files with 14 additions and 14 deletions

View File

@ -68,7 +68,7 @@ export default {
await client.counter_files
.count({
usage_data_provider_id:
this.$route.params.usage_data_provider_id,
this.$route.params.erm_usage_data_provider_id,
})
.then(
count => {
@ -79,7 +79,7 @@ export default {
);
},
table_url() {
let url = `/api/v1/erm/counter_logs?usage_data_provider_id=${this.$route.params.usage_data_provider_id}`;
let url = `/api/v1/erm/counter_logs?usage_data_provider_id=${this.$route.params.erm_usage_data_provider_id}`;
return url;
},
download_counter_file(counter_log, dt, event) {

View File

@ -71,7 +71,7 @@ export default {
loadFile(filename, content) {
this.file.filename = filename;
this.file.file_content = btoa(content);
this.getDataProvider(this.$route.params.usage_data_provider_id);
this.getDataProvider(this.$route.params.erm_usage_data_provider_id);
},
addDocument(e) {
e.preventDefault();
@ -126,7 +126,7 @@ export default {
},
},
mounted() {
this.getDataProvider(this.$route.params.usage_data_provider_id);
this.getDataProvider(this.$route.params.erm_usage_data_provider_id);
},
components: {
ButtonSubmit,

View File

@ -435,12 +435,12 @@ export default {
},
beforeRouteEnter(to, from, next) {
next(vm => {
if (to.params.usage_data_provider_id) {
vm.getDataProvider(to.params.usage_data_provider_id);
if (to.params.erm_usage_data_provider_id) {
vm.getDataProvider(to.params.erm_usage_data_provider_id);
} else {
vm.initialized = true;
}
if (from.params.usage_data_provider_id) {
if (from.params.erm_usage_data_provider_id) {
vm.previous_route = "data_provider_show";
} else {
vm.previous_route = "data_provider_list";
@ -594,7 +594,7 @@ export default {
this.$router.push({
name: "UsageStatisticsDataProvidersShow",
params: {
usage_data_provider_id:
erm_usage_data_provider_id:
erm_usage_data_provider_id,
},
});
@ -610,7 +610,7 @@ export default {
this.$router.push({
name: "UsageStatisticsDataProvidersShow",
params: {
usage_data_provider_id:
erm_usage_data_provider_id:
erm_usage_data_provider_id,
},
});

View File

@ -182,7 +182,7 @@ export default {
},
beforeRouteEnter(to, from, next) {
next(vm => {
vm.getUsageDataProvider(to.params.usage_data_provider_id);
vm.getUsageDataProvider(to.params.erm_usage_data_provider_id);
});
},
methods: {

View File

@ -48,7 +48,7 @@ export default {
await client[`usage_${this.data_type}s`]
.count({
usage_data_provider_id:
this.$route.params.usage_data_provider_id,
this.$route.params.erm_usage_data_provider_id,
})
.then(
count => {
@ -61,7 +61,7 @@ export default {
table_url() {
let url = "/api/v1/erm/usage_%ss?usage_data_provider_id=%s".format(
this.data_type,
this.$route.params.usage_data_provider_id
this.$route.params.erm_usage_data_provider_id
);
return url;
},

View File

@ -306,7 +306,7 @@ export const routes = [
),
},
{
path: ":usage_data_provider_id",
path: ":erm_usage_data_provider_id",
name: "UsageStatisticsDataProvidersShow",
component: markRaw(
UsageStatisticsDataProvidersShow
@ -322,7 +322,7 @@ export const routes = [
title: $__("Add data provider"),
},
{
path: "edit/:usage_data_provider_id",
path: "edit/:erm_usage_data_provider_id",
name: "UsageStatisticsDataProvidersFormAddEdit",
component: markRaw(
UsageStatisticsDataProvidersFormAdd