From a4246c7ea414a25e21345295baf5c88e9dd2b3f2 Mon Sep 17 00:00:00 2001 From: Michal Buzik Date: Tue, 12 Nov 2024 09:52:41 +0100 Subject: [PATCH] user groups based PL_LANG enabled, DB update needed --- Common/Common.csproj | 4 ++-- Config/FluentCommon.cs | 5 +++-- Results/Results.csproj | 4 ++-- TBF/UI/Procedures/ProcedureDlg.cs | 10 +++++----- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Common/Common.csproj b/Common/Common.csproj index 6d7c93884..cc78428c2 100644 --- a/Common/Common.csproj +++ b/Common/Common.csproj @@ -17,7 +17,7 @@ full false bin\Debug\ - TRACE;DEBUG;LANG_PL + TRACE;DEBUG prompt 4 @@ -25,7 +25,7 @@ pdbonly true bin\Release\ - TRACE;LANG_PL + TRACE prompt 4 diff --git a/Config/FluentCommon.cs b/Config/FluentCommon.cs index 71f8aa72d..daa04b0e4 100644 --- a/Config/FluentCommon.cs +++ b/Config/FluentCommon.cs @@ -128,10 +128,11 @@ namespace Config case GID.Administrators: #if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL case GID.TraceabilityManagement: -#elif LANG_PL +//#elif LANG_PL +#endif case GID.MetrologicalAuthority: case GID.WaterMeterAuthority: -#endif + admin.AddGroup(group); session.SaveOrUpdate(group); /// Save this group break; diff --git a/Results/Results.csproj b/Results/Results.csproj index 64e5d76aa..3baa75d44 100644 --- a/Results/Results.csproj +++ b/Results/Results.csproj @@ -19,7 +19,7 @@ full false bin\Debug\ - TRACE;DEBUG;LANG_PL + TRACE;DEBUG prompt 4 AnyCPU @@ -29,7 +29,7 @@ pdbonly true bin\Release\ - TRACE;LANG_PL + TRACE prompt 4 false diff --git a/TBF/UI/Procedures/ProcedureDlg.cs b/TBF/UI/Procedures/ProcedureDlg.cs index bf04b1d80..fd037a4bb 100644 --- a/TBF/UI/Procedures/ProcedureDlg.cs +++ b/TBF/UI/Procedures/ProcedureDlg.cs @@ -87,13 +87,13 @@ namespace TBF.UI.Procedures /// SharedDlgButtons configuration sharedButtons.ParentForm = parentForm; -#if LANG_PL +//#if LANG_PL sharedButtons.RequiredGroupMembership = procedure.Protected ? new GID[] { GID.WaterMeterAuthority } : new GID[] { GID.TestingSpecialists, GID.Metrologists, GID.WaterMeterAuthority }; -#else - sharedButtons.RequiredGroupMembership = procedure.Protected ? new GID[] { GID.Metrologists } - : new GID[] { GID.TestingSpecialists, GID.Metrologists }; -#endif +// #else +// sharedButtons.RequiredGroupMembership = procedure.Protected ? new GID[] { GID.Metrologists } +// : new GID[] { GID.TestingSpecialists, GID.Metrologists }; +// #endif sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove | SharedButtons.Buttons.Up |