Merge pull request #1323 from BEXIS2/rc

Rc v2.182
BEXIS2 · Sep 26, 2023 · 0f4b1a5 · 0f4b1a5
2 parents dba2039 + 317f513
commit 0f4b1a5
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 12 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
@@ -116,6 +116,7 @@ public MetadataAttributeModel Copy(long number, int numberOfSourceInPackage)
                 LowerBoundary = this.LowerBoundary,
                 PartyId = 0,
                 MappingSelectionField = false,
+                MetadataAttributeName = this.MetadataAttributeName,
                 Parameters = new List<MetadataParameterModel>()
             };
 

diff --git 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";

diff --git a/Console/BExIS.Web.Shell/General.Settings.xml b/Console/BExIS.Web.Shell/General.Settings.xml
@@ -14,5 +14,5 @@
   <!-- landing page for users , when they logged in successfuly -->
   <entry key="faq" value="https://github.com/BEXIS2/Core/wiki/FAQ" type="string" />
 
-  <entry key="version" value="2.18.1" type="string" />
+  <entry key="version" value="2.18.2" type="string" />
 </settings>
diff --git a/Console/BExIS.Web.Shell/Web.config.sample b/Console/BExIS.Web.Shell/Web.config.sample
@@ -22,7 +22,7 @@
 		<add key="UseSchemaInDatabaseGeneration" value="False" />
 		<add key="ThrowErrorWhenParialContentNotFound" value="False" />
 		<add key="ApplicationName" value="{APPLICATIONNAME}" />
-		<add key="ApplicationVersion" value="2.18.1" />
+		<add key="ApplicationVersion" value="2.18.2" />
 		<add key="SessionWarningDelaySecond" value="30" />
 		<!-- Keep it as false, there are some test data in the database-->
 		<add key="CreateDatabase" value="false" />

diff --git a/Console/Workspace b/Console/Workspace
diff --git 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)
 
 
 

diff --git a/database update scripts/Update_Script_218.1to2.18.2.sql 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;