From 3b165ba92d01b3b483b0012f64aef2c5cec9a363 Mon Sep 17 00:00:00 2001 From: wandji Date: Thu, 23 Nov 2023 17:45:50 +0100 Subject: [PATCH] Read inventory item number column decimal value from backend [SCI-9764] (#6698) --- .../vue/repository_item_sidebar/customColumns.vue | 1 + .../repository_values/RepositoryNumberValue.vue | 5 +---- app/views/repository_rows/show.json.jbuilder | 6 ++++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/javascript/vue/repository_item_sidebar/customColumns.vue b/app/javascript/vue/repository_item_sidebar/customColumns.vue index 1077ba1fa..c28d7e20c 100644 --- a/app/javascript/vue/repository_item_sidebar/customColumns.vue +++ b/app/javascript/vue/repository_item_sidebar/customColumns.vue @@ -15,6 +15,7 @@ :updatePath="updatePath" :optionsPath="column.options_path" :inArchivedRepositoryRow="inArchivedRepositoryRow" + :decimals="column.decimals" :canEdit="permissions.can_manage && !inArchivedRepositoryRow" :editingField="editingField" @setEditingField="editingField = $event" diff --git a/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryNumberValue.vue b/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryNumberValue.vue index 555e244d9..b0a06b883 100644 --- a/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryNumberValue.vue +++ b/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryNumberValue.vue @@ -65,12 +65,9 @@ export default { colName: String, colVal: Number, permissions: null, + decimals: { type: Number, default: 0 }, canEdit: { type: Boolean, defaul: false} }, - created() { - // constants - this.decimals = Number(document.getElementById(`${this.colId}`).dataset['metadataDecimals']) || 0; - }, methods: { toggleCollapse() { if (!this.expandable) return; diff --git a/app/views/repository_rows/show.json.jbuilder b/app/views/repository_rows/show.json.jbuilder index 2af8bb646..d27d3c428 100644 --- a/app/views/repository_rows/show.json.jbuilder +++ b/app/views/repository_rows/show.json.jbuilder @@ -57,6 +57,12 @@ json.custom_columns do { options_path: items_repository_repository_columns_checklist_column_path(@repository, repository_column) } + when 'RepositoryNumberValue' + { + decimals: repository_column.metadata.fetch( + 'decimals', Constants::REPOSITORY_NUMBER_TYPE_DEFAULT_DECIMALS + ).to_i + } else { options_path: ''