Browse Source

Fixed Licensing Console Product Mapping

frogsoftware 9 months ago
parent
commit
88b9b77063

+ 1 - 1
prs.desktop/prsdesktop.iss

@@ -8,7 +8,7 @@
 #define public Dependency_Path_NetCoreCheck "dependencies\"
 
 #define MyAppName "PRS Desktop"
-#define MyAppVersion "8.17"
+#define MyAppVersion "8.18"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSDesktop.exe"

+ 3 - 3
prs.licensing/Engine/LicensingEngineProperties.cs

@@ -64,16 +64,16 @@ public class LicensingEngineProperties : ServerProperties
     [EditorSequence(2)]
     public string? Server { get; set; }
     
-    [ListEditor(ListWidth = 350, ListHeight = 600, DirectEdit = true)]
+    [ListEditor(ListWidth = 350, ListHeight = 600, DirectEdit = false)]
     [EditorSequence(4)]
     [Caption("Products")]
     public List<LicenseProductMapping> Mappings { get; set; } = new();
 
-    [ListEditor(ListWidth = 250, ListHeight = 300, DirectEdit = true)]
+    [ListEditor(ListWidth = 250, ListHeight = 300, DirectEdit = false)]
     [EditorSequence(5)]
     public List<LicenseTimeDiscount> TimeDiscounts { get; set; } = new();
     
-    [ListEditor(ListWidth = 250, ListHeight = 400, DirectEdit = true)]
+    [ListEditor(ListWidth = 250, ListHeight = 400, DirectEdit = false)]
     [EditorSequence(5)]
     public List<LicenseUserDiscount> UserDiscounts { get; set; } = new();
     

+ 1 - 0
prs.licensing/GUI/Console.xaml.cs

@@ -356,6 +356,7 @@ public partial class Console : Window, INotifyPropertyChanged
                 {
                     DynamicItemsListGrid<LicenseProductMapping> mappinggrid =
                         new DynamicItemsListGrid<LicenseProductMapping>();
+                    mappinggrid.OnReconfigure += options => options.Clear();
                     mappinggrid.Items = items.First().Mappings;
                     DynamicGridUtils.CreateGridWindow("License Mappings", mappinggrid).ShowDialog();
                 };

+ 1 - 1
prs.licensing/PRSLicensing.iss

@@ -8,7 +8,7 @@
 #define public Dependency_Path_NetCoreCheck "dependencies\"
 
 #define MyAppName "PRS Licensing"
-#define MyAppVersion "8.17"
+#define MyAppVersion "8.18"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSLicensing.exe"

+ 1 - 1
prs.licensing/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "PRSLicensing": {
       "commandName": "Project",
-      "commandLineArgs": "/service=PRSLicensing_PRSLicensing"
+      "commandLineArgs": ""
     },
     "GUI": {
       "commandName": "Project"

+ 1 - 1
prs.server/PRSServer.iss

@@ -8,7 +8,7 @@
 #define public Dependency_Path_NetCoreCheck "dependencies\"
 
 #define MyAppName "PRS Server"
-#define MyAppVersion "8.17"
+#define MyAppVersion "8.18"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSServer.exe"