From 1cbbfec2296c69a98efa35787fbe3a4598ba5787 Mon Sep 17 00:00:00 2001 From: Jindrich Susen Date: Thu, 16 Nov 2023 10:50:50 +0100 Subject: [PATCH 1/2] Adding a new item to combobox failed if the underlying field required a non null value --- backend/Origam.Server/Session Stores/NewRecordSessionStore.cs | 1 + backend/Origam.Server/Session Stores/SessionStore.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/Origam.Server/Session Stores/NewRecordSessionStore.cs b/backend/Origam.Server/Session Stores/NewRecordSessionStore.cs index 269eaa2199..9e2abc450f 100644 --- a/backend/Origam.Server/Session Stores/NewRecordSessionStore.cs +++ b/backend/Origam.Server/Session Stores/NewRecordSessionStore.cs @@ -67,6 +67,7 @@ public override void Init() row, true, SecurityManager.CurrentUserProfile().Id); row.Table.NewRow(); + RemoveNullConstraints(dataSet); dataSet.Tables[rootEntity.Name].Rows.Add(row); SetDataSource(dataSet); } diff --git a/backend/Origam.Server/Session Stores/SessionStore.cs b/backend/Origam.Server/Session Stores/SessionStore.cs index c158c7600f..7a2929a46f 100644 --- a/backend/Origam.Server/Session Stores/SessionStore.cs +++ b/backend/Origam.Server/Session Stores/SessionStore.cs @@ -768,7 +768,7 @@ public virtual void OnDispose() #endregion #region Private Methods - private static void RemoveNullConstraints(DataSet dataset) + protected static void RemoveNullConstraints(DataSet dataset) { foreach (DataTable table in dataset.Tables) { From bb0b68cda9c13690dba7f8a983061c41f337722f Mon Sep 17 00:00:00 2001 From: Jindrich Susen Date: Thu, 16 Nov 2023 10:50:50 +0100 Subject: [PATCH 2/2] Properties hidden were made visible by mistake --- .../SchemaItems/NewRecordScreenBinding.cs | 4 ++-- backend/Origam.Schema/AbstractSchemaItem.cs | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/Origam.Schema.LookupModel/SchemaItems/NewRecordScreenBinding.cs b/backend/Origam.Schema.LookupModel/SchemaItems/NewRecordScreenBinding.cs index 25e8ea2ee9..656fb1f945 100644 --- a/backend/Origam.Schema.LookupModel/SchemaItems/NewRecordScreenBinding.cs +++ b/backend/Origam.Schema.LookupModel/SchemaItems/NewRecordScreenBinding.cs @@ -49,8 +49,8 @@ public class NewRecordScreenBinding : AbstractSchemaItem, IAuthorizationContextC public NewRecordScreenBinding(Guid schemaExtensionId) : base(schemaExtensionId) { } public NewRecordScreenBinding(Key primaryKey) : base(primaryKey) {} - - + + [Browsable(false)] public bool IsAvailable { get diff --git a/backend/Origam.Schema/AbstractSchemaItem.cs b/backend/Origam.Schema/AbstractSchemaItem.cs index e7871726ee..dace047281 100644 --- a/backend/Origam.Schema/AbstractSchemaItem.cs +++ b/backend/Origam.Schema/AbstractSchemaItem.cs @@ -642,6 +642,7 @@ private AbstractSchemaItem GetRootItem(AbstractSchemaItem parentItem) return GetRootItem(parentItem.ParentItem); } + [Browsable(false)] public IEnumerable Parents { get