FIX: Selection checkboxes shown when command doesn't require it 2024.4

backend/Origam.DA.Service/DatasetTools.cs

@@ -384,7 +384,6 @@ private static string ConvertValueToString(object value)
 			int iCol;
 			DataRow drSource, drTarget;
 			int nbRowSource = in_dtSource.Rows.Count;// optim
-			int nbRowTarget = inout_dtTarget.Rows.Count;// optim
 			int nbCol = in_dtSource.Columns.Count;// optim
 			bool bDoIt;
 			bool bRowModified;
@@ -636,7 +635,7 @@ private static string ConvertValueToString(object value)
 					adcPK = in_dtSource.PrimaryKey;
 					aRowKey = new object[adcPK.Length];
 					ArrayList rowsToDelete = new ArrayList();					
-
+					int nbRowTarget = inout_dtTarget.Rows.Count;
 					for (int iRowTarget = 0 ; nbRowTarget > iRowTarget ; ++iRowTarget) 
 					{
 						drTarget = inout_dtTarget.Rows[iRowTarget];

backend/Origam.Gui.Win/Workflow/WorkflowForm.cs

@@ -143,7 +143,7 @@ public void FinishTask()
 			{
 				if(this.EndRule != null)
 				{
-					this.WorkflowEngine.EvaluateEndRule(this.EndRule, this.NextData);
+					this.WorkflowEngine.EvaluateEndRule(this.EndRule, this.NextData, null);
 				}
 			}
 			catch(RuleException ruleEx)

backend/Origam.OrigamEngine/ModelXmlBuilders/FormXmlBuilder.cs

@@ -307,22 +307,35 @@ public static XmlDocument GetXml(WorkQueueClass wqc, DataSet dataset, string nam
 			Hashtable dataSources = new Hashtable();
 			OrigamSettings settings = ConfigurationManager.GetActiveConfiguration();
 			DataTable table = dataset.Tables["WorkQueueEntry"];
+			var parameterService = ServiceManager.Services.GetService<IParameterService>();
 
-			QueryParameterCollection pms = new QueryParameterCollection();
+            QueryParameterCollection pms = new QueryParameterCollection();
 			pms.Add(new QueryParameter("WorkQueueCommand_parWorkQueueId", queueId));
 			DataSet commands = core.DataService.Instance.LoadData(new Guid("1d33b667-ca76-4aaa-a47d-0e404ed6f8a6"), new Guid("421aec03-1eec-43f9-b0bb-17cfc24510a0"), Guid.Empty, Guid.Empty, null, pms);
 
-			ArrayList commandRows = new ArrayList();
+            var commandRows = new List<DataRow>();
             IOrigamAuthorizationProvider auth = SecurityManager.GetAuthorizationProvider();
-			foreach (DataRow cmdRow in commands.Tables["WorkQueueCommand"].Rows)
-			{
-				if (cmdRow.IsNull("Roles") || !auth.Authorize(SecurityManager.CurrentPrincipal, (string)cmdRow["Roles"]))
+            foreach (DataRow cmdRow in commands.Tables["WorkQueueCommand"].Rows)
+            {
+                if (cmdRow.IsNull("Roles") || !auth.Authorize(SecurityManager.CurrentPrincipal, (string)cmdRow["Roles"]))
+                {
+                    continue;
+                }
+                commandRows.Add(cmdRow);
+            }
+
+            bool showCheckboxes = commandRows.Any(cmdRow =>
+            {
+				if ((Guid)cmdRow["refWorkQueueCommandTypeId"] == (Guid)parameterService.GetParameterValue("WorkQueueCommandType_WorkQueueClassCommand"))
 				{
-					continue;
+					WorkQueueWorkflowCommand cmd = wqc.GetCommand((string)cmdRow["Command"]);
+					return cmd.Mode == PanelActionMode.MultipleCheckboxes;
 				}
-				commandRows.Add(cmdRow);
-			}
-			bool showCheckboxes = commandRows.Count > 0;
+				else
+				{
+					return true;
+				}
+            });
 
 			// Window
 			XmlDocument doc = GetWindowBaseXml(
@@ -460,8 +473,6 @@ public static XmlDocument GetXml(WorkQueueClass wqc, DataSet dataset, string nam
 				CreateComponentBinding(doc, bindingsElement, queueId.ToString(), "Id", "WorkQueueEntry", "65DF44F9-C050-4554-AD9A-896445314279", "Id", "WorkQueueEntry", false);
 			}
 
-			IParameterService parameterService = ServiceManager.Services.GetService(typeof(IParameterService)) as IParameterService;
-
 			foreach(DataRow cmdRow in commandRows)
 			{
 				Hashtable cmdParams = new Hashtable();

backend/Origam.Schema.EntityModel/Data Structure/DataStructureRule.cs

@@ -62,17 +62,7 @@ public int Priority
 
 		private string entityName;
 
-		public String EntityName
-		{
-			get
-			{
-				if (entityName == null)
-				{
-					entityName = Entity.Name;
-				}
-				return entityName;
-			}
-		}
+		public string EntityName => entityName ??= Entity?.Name;
 
 		[TypeConverter(typeof(DataQueryEntityConverter))]
 		[RefreshProperties(RefreshProperties.Repaint)]

backend/Origam.Schema.LookupModel/SchemaItems/NewRecordScreenBindingParameterMapping.cs

@@ -59,7 +59,7 @@ public NewRecordScreenBindingParameterMapping(Key primaryKey)
     [Category("Data")]
     [NotNullModelElementRule]
     [XmlAttribute("parameterName")]
-    [Description("Parameter used in (added to) the list data structure of the lookup. The reference source column will be set in the properties of the screen section combo box where the lookup is used. If the actual text content of the lookup field should be copied, the value should be set to SearchText.")]
+    [Description("Parameter used in (added to) the list data structure of the lookup. The referenced source column will be set in the properties of the screen section combo box where the lookup is used. If the actual text content of the lookup field should be copied, the value should be set to SearchText.")]
     public string ParameterName { get; set; }
 
     [Category("Data")]

backend/Origam.Schema.MenuModel/Converters/MenuFormReferenceMethodConverter.cs

@@ -40,23 +40,23 @@ public override bool GetStandardValuesExclusive(ITypeDescriptorContext context)
 			return true;
 		}
 
-		public override System.ComponentModel.TypeConverter.StandardValuesCollection 
+		public override StandardValuesCollection 
 			GetStandardValues(ITypeDescriptorContext context)
 		{
-			FormReferenceMenuItem currentItem = context.Instance as FormReferenceMenuItem;
-			ArrayList methods = currentItem.Screen.DataStructure.Methods;
-
-			ArrayList array = new ArrayList(methods.Count);
-			foreach(AbstractSchemaItem item in methods)
+			var currentItem = context.Instance as FormReferenceMenuItem;
+			ArrayList methods = currentItem?.Screen?.DataStructure?.Methods;
+			if (methods == null)
 			{
-				array.Add(item);
+				return new StandardValuesCollection(new ArrayList());
 			}
-
-			array.Add(null);
-
-			array.Sort();
-
-			return new StandardValuesCollection(array);
+			var output = new ArrayList(methods.Count);
+			foreach (AbstractSchemaItem method in methods)
+			{
+				output.Add(method);
+			}
+			output.Add(null);
+			output.Sort();
+			return new StandardValuesCollection(output);
 		}
 
 		public override bool CanConvertFrom(System.ComponentModel.ITypeDescriptorContext context, System.Type sourceType)

backend/Origam.Server/Session Stores/NewRecordSessionStore.cs

@@ -22,6 +22,7 @@
 using System;
 using System.Data;
 using System.Globalization;
+using System.Linq;
 using Origam.DA;
 using Origam.Extensions;
 using Origam.Schema.EntityModel;
@@ -63,20 +64,31 @@ var rootEntity
         DatasetTools.ApplyPrimaryKey(row);
         DatasetTools.UpdateOrigamSystemColumns(
             row, true, SecurityManager.CurrentUserProfile().Id);
-        FillInitialValues(row);
         dataSet.RemoveNullConstraints();
         table.Rows.Add(row);
         SetDataSource(dataSet);
+        FillInitialValues(row);
     }
 
     private void FillInitialValues(DataRow row)
     {
-        foreach (string columnName in Request.NewRecordInitialValues.Keys)
+        try
         {
-            if (Request.NewRecordInitialValues[columnName] != null)
+            RegisterEvents();
+            // we're sorting column names in order to introduce
+            // a level of predictability in the order of rule processing
+            var sortedColumnNames = Request.NewRecordInitialValues.Keys.ToList<string>();
+            sortedColumnNames.Sort();
+            foreach (var columnName in sortedColumnNames
+                         .Where(columnName 
+                             => Request.NewRecordInitialValues[columnName] != null))
             {
-                row[columnName] = Request.NewRecordInitialValues[columnName];
+                row[columnName] = Request.NewRecordInitialValues[columnName]!;
             }
         }
+        finally
+        {
+            UnregisterEvents();
+        }
     }
 }