Авторизация по ключам
This commit is contained in:
2025-02-20 13:47:50 +03:00
parent daa53d9d73
commit a8244bf872
5 changed files with 28 additions and 6 deletions

6
.idea/workspace.xml generated
View File

@@ -7,7 +7,11 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
<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/ComponentsServer/Recipient/UI/RecipientsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Recipient/UI/RecipientsForm.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/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeTests.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

View File

@@ -8,8 +8,8 @@
"Visualizer_2Path": "C:\\Users\\misha\\Documents",
"InstructionPath": "C:\\Users\\misha\\Documents",
"PerformanceAnalyzerPath": "C:\\Users\\misha\\Documents",
"AutoBugReportsLoad": false,
"AutoTestsLoad": false,
"AutoBugReportsLoad": true,
"AutoTestsLoad": true,
"ConfirmPassesStart": true,
"ShowPassesDone": true,
"FocusPassesResult": true,

View File

@@ -4,7 +4,8 @@ import Common.Visual.DataSetControlForm;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import _VisualDVM.ComponentsServer.Recipient.Recipient;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
@@ -27,4 +28,17 @@ public class RecipientsForm extends DataSetControlForm<Recipient> {
protected DataMenuBar createMenuBar() {
return new DataMenuBar(dataSource.getPluralDescription(), PassCode.SaveBugReportExecutor,PassCode.SaveBugReportRecipients);
}
@Override
protected ColumnInfo<Recipient> createPKColumn() {
return new ColumnInfo<Recipient>(dataSource.getPKName()) {
@Override
public Object getFieldAt(Recipient object) {
return object.getPK();
}
@Override
public boolean isVisible() {
return Global.mainModule.getAccount().role.equals(AccountRole.Admin);
}
};
}
}

View File

@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
import java.util.Vector;
public class Constants {
public static final int version = 1177;
public static final int version = 1178;
public static final int planner_version = 10;
public static final int testingMaxKernels = 64; //вообще говоря, это параметр машины.
//--

View File

@@ -1,5 +1,7 @@
package _VisualDVM.Passes.All;
import Common.Visual.Controls.PassButton;
import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
import _VisualDVM.Global;
import _VisualDVM.Passes.Server.TestingServerPass;
import _VisualDVM.Repository.Server.ServerCode;
@@ -11,7 +13,9 @@ public class SynchronizeTests extends TestingServerPass<Object> {
File new_db_file;
@Override
protected boolean canStart(Object... args) throws Exception {
return Global.mainModule.getAccount().CheckRegistered(Log)&&SendRequest(ServerCode.ReceiveTestsDatabase);
UserAccount account = Global.mainModule.getAccount();
return (account.role.equals(AccountRole.Admin) || account.role.equals(AccountRole.Developer))
&& SendRequest(ServerCode.ReceiveTestsDatabase);
}
@Override
public String getIconPath() {