From 4e8c5ec89e468b0049c48239598e778429ba5571 Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Tue, 15 Aug 2023 11:48:57 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D1=83=20=D1=81=20Workbe?= =?UTF-8?q?nch=3Dnil=20=D0=B2=20TeacherControlPlugin.cs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configuration/GlobalAssemblyInfo.cs | 2 +- Configuration/Version.defs | 4 ++-- Release/pabcversion.txt | 2 +- ReleaseGenerators/PascalABCNET_version.nsh | 2 +- VisualPlugins/TraningControlPlugin/TeacherControlPlugin.cs | 4 +++- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index bc2c53800..d7e8d8a9c 100644 --- a/Configuration/GlobalAssemblyInfo.cs +++ b/Configuration/GlobalAssemblyInfo.cs @@ -15,7 +15,7 @@ internal static class RevisionClass public const string Major = "3"; public const string Minor = "9"; public const string Build = "0"; - public const string Revision = "3340"; + public const string Revision = "3341"; public const string MainVersion = Major + "." + Minor; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; diff --git a/Configuration/Version.defs b/Configuration/Version.defs index 2a2c87a3f..29d4a855a 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%COREVERSION%=0 -%REVISION%=3340 %MINOR%=9 +%REVISION%=3341 +%COREVERSION%=0 %MAJOR%=3 diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 5be58c721..b4108542a 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.9.0.3340 +3.9.0.3341 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 0e72b1f45..7b6a1c709 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.9.0.3340' +!define VERSION '3.9.0.3341' diff --git a/VisualPlugins/TraningControlPlugin/TeacherControlPlugin.cs b/VisualPlugins/TraningControlPlugin/TeacherControlPlugin.cs index 80a79991c..bb0e75b8a 100644 --- a/VisualPlugins/TraningControlPlugin/TeacherControlPlugin.cs +++ b/VisualPlugins/TraningControlPlugin/TeacherControlPlugin.cs @@ -22,7 +22,7 @@ namespace VisualPascalABCPlugins //private TeacherControlForm RegisterForm = new TeacherControlForm(); // старая форма авторизации //private LoginForm RegisterFormNew = new LoginForm(); // новая форма авторизации // User - SiteAccessProvider User = new SiteAccessProvider(); + SiteAccessProvider User; private PluginGUIItem Item; public string Name { get => "Teacher Control Plugin"; } @@ -53,6 +53,8 @@ namespace VisualPascalABCPlugins VisualEnvironmentCompiler = Workbench.VisualEnvironmentCompiler; // RegisterForm.VisualEnvironmentCompiler = VisualEnvironmentCompiler; // Пока форма регистрации никак не связана с компилятором + User = new SiteAccessProvider(); + // Регистрация обработчика this.Workbench.ServiceContainer.RunService.Starting += RunStartingHandler; this.Workbench.ServiceContainer.RunService.ChangeArgsBeforeRun += ChangeArgsBeforeRunHandler;