M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

небольшой баг. у незарегистрированного пользователя могли проверяться пакеты.

Browse Source
This commit is contained in:
02090095
2025-03-03 16:21:32 +03:00
parent d455c21b9c
commit 7728ddbf23
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.idea/workspace.xml generated
View File

@@ -8,10 +8,9 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.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/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/RepositoryServer.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/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.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> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

2
src/_VisualDVM/Constants.java
View File

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

6
src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java
View File

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

4
src/_VisualDVM/Visual/MainUI.java
View File

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