Selaa lähdekoodia

Fixed Issue with Task Employee/Manager selections
Added ability to start Database Engine without Rest Listener (ie IPC/Socket Only)

frogsoftware 2 vuotta sitten
vanhempi
commit
b226d9a3f0
2 muutettua tiedostoa jossa 11 lisäystä ja 14 poistoa
  1. 3 3
      prs.desktop/Grids/KanbanGrid.cs
  2. 8 11
      prs.server/Engines/Database/DatabaseEngine.cs

+ 3 - 3
prs.desktop/Grids/KanbanGrid.cs

@@ -143,15 +143,15 @@ namespace PRSDesktop
             else if (name == "EmployeeLink.ID")
             {
                 EnsureAssignee(editor, items.FirstOrDefault());
-                var enabled = (Guid)value == items.FirstOrDefault()?.ManagerLink.ID &&
-                              items.FirstOrDefault()?.ManagerLink.UserLink.ID == ClientFactory.UserGuid;
+                var enabled = items.FirstOrDefault()?.ManagerLink.UserLink.ID == ClientFactory.UserGuid &&
+                              (Guid)(value ?? Guid.Empty) == items.FirstOrDefault()?.ManagerLink.ID;
                 editor.FindEditor("Private").IsEnabled = enabled;
             }
             else if (name == "ManagerLink.ID")
             {
                 EnsureAllocator(editor, items.FirstOrDefault());
                 var enabled = items.FirstOrDefault()?.EmployeeLink.UserLink.ID == ClientFactory.UserGuid &&
-                              (Guid)value == items.FirstOrDefault()?.EmployeeLink.ID;
+                              (Guid)(value ?? Guid.Empty) == items.FirstOrDefault()?.EmployeeLink.ID;
                 editor.FindEditor("Private").IsEnabled = enabled;
             }
             else if (name == "Private")

+ 8 - 11
prs.server/Engines/Database/DatabaseEngine.cs

@@ -142,11 +142,7 @@ namespace PRSServer
         public override void Run()
         {
             Logger.Send(LogType.Information, "", "Starting..");
-
-
-            if (Properties.Port.Equals(0))
-                throw new Exception("Error: Port not Specified\n");
-
+            
             if (string.IsNullOrEmpty(Properties.FileName))
                 throw new Exception("Error: Filename not Specified\n");
 
@@ -231,13 +227,9 @@ namespace PRSServer
                 RestListener.Start();
                 Logger.Send(LogType.Information, "", $"- Rest Listener Started: Port={Properties.Port}");
             }
-            
-            // Older-Style Pipe (IPC Server)
-            _ipcServer = new IPCServer(_ipcPipeName);
-            _ipcServer.Start();
-            Logger.Send(LogType.Information, "", $"- IPC Pipe Listener started: Name=[{_ipcPipeName}]");
 
-            // New Style Socket Listenet
+
+            // New Style Socket Listener
             if (Properties.RPCPort != 0)
             {
                 var sockettransport = new RpcServerSocketTransport(Properties.RPCPort); //, certificate);
@@ -248,6 +240,11 @@ namespace PRSServer
                 Logger.Send(LogType.Information, "", $"- RPC Listener Started: Port={Properties.RPCPort}");
             }     
             
+            // Older-Style Pipe (IPC Server)
+            _ipcServer = new IPCServer(_ipcPipeName);
+            _ipcServer.Start();
+            Logger.Send(LogType.Information, "", $"- IPC Pipe Listener started: Name=[{_ipcPipeName}]");
+            
             // New Style Pipe (RPC) Listener
             var pipetransport = new RpcServerPipeTransport(_rpcPipeName);
             PushManager.AddPusher(pipetransport);