From e2e2d9c0e39a43f93afaf611f4a0d937ed5dbbb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sch=C3=B6ne?= Date: Tue, 26 Sep 2023 14:23:30 +0200 Subject: [PATCH 1/3] #1322 add missing metadat attribute name to the copied model and use number instead of count --- .../Areas/DCM/Models/Metadata/MetadataAttributeModel.cs | 1 + .../Areas/DCM/Views/Form/_metadataAttributeView.cshtml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Console/BExIS.Web.Shell/Areas/DCM/Models/Metadata/MetadataAttributeModel.cs b/Console/BExIS.Web.Shell/Areas/DCM/Models/Metadata/MetadataAttributeModel.cs index c3a4106090..42cc9247ea 100644 --- a/Console/BExIS.Web.Shell/Areas/DCM/Models/Metadata/MetadataAttributeModel.cs +++ b/Console/BExIS.Web.Shell/Areas/DCM/Models/Metadata/MetadataAttributeModel.cs @@ -116,6 +116,7 @@ public MetadataAttributeModel Copy(long number, int numberOfSourceInPackage) LowerBoundary = this.LowerBoundary, PartyId = 0, MappingSelectionField = false, + MetadataAttributeName = this.MetadataAttributeName, Parameters = new List() }; diff --git a/Console/BExIS.Web.Shell/Areas/DCM/Views/Form/_metadataAttributeView.cshtml b/Console/BExIS.Web.Shell/Areas/DCM/Views/Form/_metadataAttributeView.cshtml index d4c1338d71..7c39900acd 100644 --- a/Console/BExIS.Web.Shell/Areas/DCM/Views/Form/_metadataAttributeView.cshtml +++ b/Console/BExIS.Web.Shell/Areas/DCM/Views/Form/_metadataAttributeView.cshtml @@ -6,8 +6,8 @@ @{ string id = Model.Id + "_" + Model.Parent.Id + "_" + Model.Number + "_" + Model.ParentModelNumber + "_" + Model.NumberOfSourceInPackage + "_" + Model.ParentStepId; - string idByXpath = ((string)ViewData["Xpath"]).Replace("//", "_").Replace('[', '_').Replace(']', '_') + Model.DisplayName + "_" + Model.NumberOfSourceInPackage; // Replace special character by underscore - string xpath = ((string)ViewData["Xpath"]) + "//" + Model.DisplayName + "[1]//" + Model.MetadataAttributeName + "[" + Model.NumberOfSourceInPackage + "]"; + string idByXpath = ((string)ViewData["Xpath"]).Replace("//", "_").Replace('[', '_').Replace(']', '_') + Model.DisplayName + "_" + Model.Number; // Replace special character by underscore + string xpath = ((string)ViewData["Xpath"]) + "//" + Model.DisplayName + "[1]//" + Model.MetadataAttributeName + "[" + Model.Number + "]"; string idInput = id + "_Input"; string idAdd = id + "_Add"; string idRemove = id + "_Remove"; From 65052c8e7ff9e3b9fc76e9f1da3a530aa26d4519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sch=C3=B6ne?= Date: Tue, 26 Sep 2023 14:30:54 +0200 Subject: [PATCH 2/3] #1322 release preparation --- Console/BExIS.Web.Shell/General.Settings.xml | 2 +- Console/BExIS.Web.Shell/Web.config.sample | 2 +- Release Notes/Release_Notes.md | 10 +++------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Console/BExIS.Web.Shell/General.Settings.xml b/Console/BExIS.Web.Shell/General.Settings.xml index 29fa230ebf..95e10dd823 100644 --- a/Console/BExIS.Web.Shell/General.Settings.xml +++ b/Console/BExIS.Web.Shell/General.Settings.xml @@ -14,5 +14,5 @@ - + \ No newline at end of file diff --git a/Console/BExIS.Web.Shell/Web.config.sample b/Console/BExIS.Web.Shell/Web.config.sample index 97473e618a..b104fbc3b2 100644 --- a/Console/BExIS.Web.Shell/Web.config.sample +++ b/Console/BExIS.Web.Shell/Web.config.sample @@ -22,7 +22,7 @@ - + diff --git a/Release Notes/Release_Notes.md b/Release Notes/Release_Notes.md index 74a1dec221..ff82af37b0 100644 --- a/Release Notes/Release_Notes.md +++ b/Release Notes/Release_Notes.md @@ -1,14 +1,10 @@ # BEXIS 2.18 Release Notes ->**Database update**: [Update_Script_218to2181.sql](https://github.com/BEXIS2/Core/blob/rc/database%20update%20scripts/Update_Script_218to2.18.1.sql) +>**Database update**: [Update_Script_2181to2182.sql](https://github.com/BEXIS2/Core/blob/rc/database%20update%20scripts/Update_Script_218to2.18.1.sql) - - -**Workspace changes:** [2.18...2.18.1](https://github.com/BEXIS2/Workspace/compare/2.18...2.18.1) +**Workspace changes:** [2.18.1...2.18.2](https://github.com/BEXIS2/Workspace/compare/2.18.1...2.18.2) ### Bugs -- Fix hangs when loading data structures linked to datasets that have been deleted (https://github.com/BEXIS2/Core/issues/1222) -- Fix Attachment Typos (https://github.com/BEXIS2/Core/issues/1194) -- Fix Delete Attachment: system key not triggered & dataset version overwritten (https://github.com/BEXIS2/Core/issues/1179) +- Mismatch between Values & linked Parties in Metadata (https://github.com/BEXIS2/Core/issues/1322) From 317f513859c76adcb5ee3de3a5d7d5c1df4ca723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sch=C3=B6ne?= Date: Tue, 26 Sep 2023 14:34:02 +0200 Subject: [PATCH 3/3] #1322 update db scripts --- Console/Workspace | 2 +- database update scripts/Update_Script_218.1to2.18.2.sql | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 database update scripts/Update_Script_218.1to2.18.2.sql diff --git a/Console/Workspace b/Console/Workspace index c3f52beafe..9408af7eb9 160000 --- a/Console/Workspace +++ b/Console/Workspace @@ -1 +1 @@ -Subproject commit c3f52beafe72de78986db41462d0f23420fd1fb4 +Subproject commit 9408af7eb91b6e8bea29de27751c2c4d3f167da8 diff --git a/database update scripts/Update_Script_218.1to2.18.2.sql b/database update scripts/Update_Script_218.1to2.18.2.sql new file mode 100644 index 0000000000..803a7c0070 --- /dev/null +++ b/database update scripts/Update_Script_218.1to2.18.2.sql @@ -0,0 +1,9 @@ +BEGIN TRANSACTION; + +-- ROLLBACK TRANSACTION; +-- Insert version +INSERT INTO public.versions( + versionno, extra, module, value, date) + VALUES (1, null, 'Shell', '2.18.2',NOW()); + +COMMIT;