Merge pull request #1824 from BEXIS2/rc

merge from rc to master
BEXIS2 · Sep 3, 2024 · 94518b5 · 94518b5
2 parents 296b73c + 3a0ef3a
commit 94518b5
Show file tree

Hide file tree

Showing 23 changed files with 854 additions and 499 deletions.
diff --git a/Components/AAA/BExIS.Security.Services/Requests/RequestManager.cs b/Components/AAA/BExIS.Security.Services/Requests/RequestManager.cs
@@ -68,7 +68,7 @@ public Request Create(long applicantId, long entityId, long key, short rights =
                         PartyRepository.Query(m => m.Name == key.ToString() && m.PartyType.Id == dataset_partyType.Id)
                             .FirstOrDefault();
 
-                    var ownerPartyRelationshipType = ModuleManager.GetModuleSettings("bam").GetValueByKey<string>("OwnerPartyRelationshipType");
+                    var ownerPartyRelationshipType = ModuleManager.GetModuleSettings("bam").GetValueByKey("OwnerPartyRelationshipType");
 
                     if (dataset_party != null && ownerPartyRelationshipType != null)
                     {

diff --git a/Components/Utils/BExIS.Utils.Data/Helpers/ShellSeedDataGenerator.cs b/Components/Utils/BExIS.Utils.Data/Helpers/ShellSeedDataGenerator.cs
@@ -40,9 +40,9 @@ public void GenerateSeedData()
 
                 var o12 = operationManager.Find("Shell", "Settings", "*") ?? operationManager.Create("Shell", "Settings", "*", settings);
 
-                if (!versionManager.Exists("Shell", "3.3.1"))
+                if (!versionManager.Exists("Shell", "3.3.2"))
                 {
-                    versionManager.Create("Shell", "3.3.1");
+                    versionManager.Create("Shell", "3.3.2");
                 }
             }
         }

diff --git a/Console/BExIS.Web.Shell.Svelte/package-lock.json b/Console/BExIS.Web.Shell.Svelte/package-lock.json
diff --git a/Console/BExIS.Web.Shell.Svelte/package.json b/Console/BExIS.Web.Shell.Svelte/package.json
@@ -52,7 +52,7 @@
 	},
 	"type": "module",
 	"dependencies": {
-		"@bexis2/bexis2-core-ui": "0.4.8",
+		"@bexis2/bexis2-core-ui": "0.4.13",
 		"@sveltejs/adapter-static": "^3.0.1",
 		"patch-package": "^8.0.0",
 		"svelte-collapsible": "^0.3.0",