Merge branch 'main' of http://alex-freenas.ddns.net:3000/M/VisualSapfor

.idea/workspace.xml

@@ -8,8 +8,9 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/UI/CompilerOptionsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

src/_VisualDVM/ComponentsServer/ComponentsServer.java

@@ -105,10 +105,6 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
         super(BugReportsDatabase.class);
     }
     @Override
-    public String getServerFileName() {
-        return "VisualSapfor.jar";
-    }
-    @Override
     public String getServerHomeName() {
         return "_sapfor_x64";
     }

src/_VisualDVM/Constants.java

@@ -46,7 +46,7 @@ public class Constants {
     public static final String SMTPHost = "smtp.mail.ru";
     public static final int SMTPPort = 465;
     public static final int MailSocketPort = 465;
-    //7796 отладочный порт
+    //
     public static final int ComponentsServerPort = 7995; //7795
     public static final int TestingServerPort = 7998;    //7998
     public static final int SocketTimeout = 0;

src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java

@@ -1,5 +1,7 @@
 package _VisualDVM.Passes.Testing;
 import Common.Database.Tables.iDBTable;
+import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
+import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.TestingServerPass;
 import _VisualDVM.Repository.Server.ServerCode;
@@ -22,13 +24,15 @@ public abstract class ActualizeTestingPackages<P extends TestingPackage> extends
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
+        UserAccount account = Global.mainModule.getAccount();
         target = new Vector<>();
         for (P testingPackage : getTable().Data.values()) {
             if (testingPackage.state.isActive()) {
                 target.add(new Pair(testingPackage.id, testingPackage.ChangeDate));
             }
         }
-        return !target.isEmpty()&&SendRequest(getCheckCode(), "", target);
+        return (account.role.equals(AccountRole.Admin) || account.role.equals(AccountRole.Developer)) &&
+                !target.isEmpty()&&SendRequest(getCheckCode(), "", target);
     }
     @Override
     protected void performDone() throws Exception {

src/_VisualDVM/Repository/Server/RepositoryServer.java

@@ -30,7 +30,7 @@ import java.util.Vector;
 public abstract class RepositoryServer<D extends Database> {
     protected static FileWriter Log;
     protected static boolean printOn = true;
-    public abstract String getServerFileName();
+    public String getServerFileName(){return Constants.ApplicationFileName;};
     public abstract String getServerHomeName();
     //-
     public D db;

src/_VisualDVM/TestingSystem/Common/TestingServer.java

@@ -266,10 +266,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         //-
     }
     @Override
-    public String getServerFileName() {
-        return "TestingSystem.jar";
-    }
-    @Override
     public String getServerHomeName() {
         return "_testing_system";
     }

src/_VisualDVM/Visual/MainUI.java

@@ -107,6 +107,8 @@ public class MainUI extends UIModule_ {
         getMainWindow().getCallbackWindow().showNoBugReports();
         Global.normalProperties.setControlVisible("AutoBugReportsLoad", false);
         Global.normalProperties.setControlVisible("AutoTestsLoad", false);
+        Global.normalProperties.AutoCheckTesting = false;
+        Global.normalProperties.Update();
     };
     void showUserRights(){
         Global.mainModule.SetUserPassesAccess();
@@ -115,6 +117,8 @@ public class MainUI extends UIModule_ {
         getMainWindow().getCallbackWindow().showMyOnlyBugReports();
         Global.normalProperties.setControlVisible("AutoBugReportsLoad", true);
         Global.normalProperties.setControlVisible("AutoTestsLoad", false);
+        Global.normalProperties.AutoCheckTesting = false;
+        Global.normalProperties.Update();
     };
     void showDeveloperRights(){
         Global.mainModule.SetDeveloperPassesAccess();