Browse Source

Fixed menu setup actions duplicating when relogging in. Added PRSSharedUtils.RegisterClasses.

Kenric Nugteren 1 year ago
parent
commit
0556bda81c

+ 3 - 0
prs.desktop/MainWindow.xaml.cs

@@ -261,6 +261,7 @@ namespace PRSDesktop
                     Task.Run(() => CoreUtils.RegisterClasses(typeof(KanbanGrid).Assembly)),
                     Task.Run(() => CoreUtils.RegisterClasses()),
                     Task.Run(() => ComalUtils.RegisterClasses()),
+                    Task.Run(() => PRSSharedUtils.RegisterClasses()),
                     Task.Run(() => ReportUtils.RegisterClasses()),
                     Task.Run(() => ConfigurationUtils.RegisterClasses()),
                     Task.Run(() => DynamicGridUtils.RegisterClasses()),
@@ -652,6 +653,8 @@ namespace PRSDesktop
                         || Security.CanView<TimeSheet>()
                         || Security.CanView<GPSTracker>();
 
+            SetupActions.Clear();
+
             Progress.ShowModal(
                 new ProgressSection(
                     "Configuring Main Screen",

+ 1 - 0
prs.server/Engines/Database/DatabaseEngine.cs

@@ -151,6 +151,7 @@ namespace PRSServer
             StoreUtils.RegisterClasses();
             CoreUtils.RegisterClasses();
             ComalUtils.RegisterClasses();
+            PRSSharedUtils.RegisterClasses();
             ReportUtils.RegisterClasses();
             ConfigurationUtils.RegisterClasses();
 

+ 3 - 1
prs.server/Engines/GPS/GPSEngine.cs

@@ -22,6 +22,7 @@ using InABox.IPC;
 using InABox.Rpc;
 using PRSServer.Engines;
 using System.Timers;
+using PRS.Shared;
 
 namespace PRSServer
 {
@@ -279,7 +280,8 @@ namespace PRSServer
 
             CoreUtils.RegisterClasses();
             ComalUtils.RegisterClasses();
-            
+            PRSSharedUtils.RegisterClasses();
+
             //ClientFactory.SetClientType(typeof(IPCClient<>), Platform.GPSEngine, Version, DatabaseServerProperties.GetPipeName(Properties.Server,false));
             var transport = new RpcClientPipeTransport(DatabaseServerProperties.GetPipeName(Properties.Server, true));
             ClientFactory.SetClientType(typeof(RpcClient<>), Platform.GPSEngine, Version, transport);

+ 2 - 0
prs.server/Engines/WebEngine/WebEngine.cs

@@ -8,6 +8,7 @@ using InABox.Configuration;
 using InABox.Core;
 using InABox.Wpf.Reports;
 using InABox.Rpc;
+using PRS.Shared;
 
 namespace PRSServer
 {
@@ -40,6 +41,7 @@ namespace PRSServer
             StoreUtils.RegisterClasses();
             CoreUtils.RegisterClasses();
             ComalUtils.RegisterClasses();
+            PRSSharedUtils.RegisterClasses();
             ReportUtils.RegisterClasses();
             ConfigurationUtils.RegisterClasses();
             

+ 1 - 0
prs.server/Forms/Configuration.xaml.cs

@@ -54,6 +54,7 @@ namespace PRSServer
                 StoreUtils.RegisterClasses();
                 CoreUtils.RegisterClasses();
                 ComalUtils.RegisterClasses();
+                PRSSharedUtils.RegisterClasses();
                 ReportUtils.RegisterClasses();
                 ConfigurationUtils.RegisterClasses();
 

+ 19 - 0
prs.shared/PRSSharedUtils.cs

@@ -0,0 +1,19 @@
+using Comal.Classes;
+using InABox.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PRS.Shared
+{
+    [LibraryInitializer]
+    public static class PRSSharedUtils
+    {
+        public static void RegisterClasses()
+        {
+            CoreUtils.RegisterClasses(typeof(PRSSharedUtils).Assembly);
+        }
+    }
+}