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

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

Browse Source
This commit is contained in:
02090095
2023-11-20 22:59:55 +03:00
parent e43feb9ab5
commit 277de7efe0
4 changed files with 22 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.idea/workspace.xml generated
View File

@@ -8,13 +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/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTestProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTestProject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.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" />

4
src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java
View File

@@ -15,9 +15,7 @@ public interface MainWindow {
void FocusCallback(); void FocusCallback();
void FocusTests(); void FocusTests();
void FocusTesting(); void FocusTesting();
void SwitchTestingTabs(boolean flag);
void ShowTestingTab();
void HideTestingTab();
//- //-
void ShowCredentials(); void ShowCredentials();
void ShowCheckedTestsCount(); void ShowCheckedTestsCount();

4
src/Visual_DVM_2021/UI/Main/CallbackForm.java
View File

@@ -359,7 +359,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
public void EnableBugreports() { public void EnableBugreports() {
UI.Clear(accountPanel); UI.Clear(accountPanel);
accountPanel.add(SC10); accountPanel.add(SC10);
UI.getMainWindow().ShowTestingTab(); UI.getMainWindow().SwitchTestingTabs(true);
} }
@Override @Override
public void setUserRights() { public void setUserRights() {
@@ -393,7 +393,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
case Undefined: case Undefined:
UI.Clear(accountPanel); UI.Clear(accountPanel);
accountPanel.add(new CallbackWelcomeForm().content); accountPanel.add(new CallbackWelcomeForm().content);
UI.getMainWindow().HideTestingTab(); UI.getMainWindow().SwitchTestingTabs(false);
break; break;
case User: case User:
//видит только свои баги. //видит только свои баги.

29
src/Visual_DVM_2021/UI/Main/MainForm.java
View File

@@ -29,7 +29,6 @@ public class MainForm extends Form implements MainWindow {
private JPanel Content; private JPanel Content;
private JTabbedPane globalTabs; private JTabbedPane globalTabs;
private JPanel mainPanel; private JPanel mainPanel;
@Override @Override
protected JPanel getMainPanel() { protected JPanel getMainPanel() {
return Content; return Content;
@@ -60,7 +59,7 @@ public class MainForm extends Form implements MainWindow {
SaveTestsPanel(); SaveTestsPanel();
SaveTestingPanel(); SaveTestingPanel();
//-- //--
if (UI.debugWindow!=null) if (UI.debugWindow != null)
((FormWithSplitters) UI.debugWindow).SaveSplitters(); ((FormWithSplitters) UI.debugWindow).SaveSplitters();
//-- //--
Global.FinishApplication(); Global.FinishApplication();
@@ -138,22 +137,12 @@ public class MainForm extends Form implements MainWindow {
} }
private void InstallTestingPanel() { private void InstallTestingPanel() {
testingForm = new TestingForm(); testingForm = new TestingForm();
ShowTestingTab();
}
@Override
public void ShowTestingTab() {
if (globalTabs.getTabCount() < 5)
globalTabs.insertTab("Тестирование", globalTabs.insertTab("Тестирование",
Utils.getIcon("/icons/Session.png"), Utils.getIcon("/icons/Session.png"),
testingForm.getContent(), testingForm.getContent(),
"Система тестирования", 4); "Система тестирования", 4);
} }
@Override @Override
public void HideTestingTab() {
if (globalTabs.getTabCount() == 5)
globalTabs.removeTabAt(4);
}
@Override
public void ShowCredentials() { public void ShowCredentials() {
/* /*
String res = ""; String res = "";
@@ -162,14 +151,12 @@ public class MainForm extends Form implements MainWindow {
if (Current.HasUser()) { if (Current.HasUser()) {
res = Current.getUser().login + res; res = Current.getUser().login + res;
} else res = "?" + res; } else res = "?" + res;
/*
if (Current.HasCompiler() && Current.getCompiler().type.equals(CompilerType.dvm)) { if (Current.HasCompiler() && Current.getCompiler().type.equals(CompilerType.dvm)) {
testingTabs.setTitleAt(3, "DVM система: " + Current.getCompiler().description); res += "DVM система: " + Current.getCompiler().description;
} else { } else {
testingTabs.setTitleAt(3, "DVM система: ?"); res += "DVM система: ?";
} }
*/
/*д
} else { } else {
res += "?@?"; res += "?@?";
} }
@@ -183,7 +170,7 @@ public class MainForm extends Form implements MainWindow {
Vector<Test> selected_tests = new Vector<>(); Vector<Test> selected_tests = new Vector<>();
Vector<Test> group_tests = new Vector<>(); Vector<Test> group_tests = new Vector<>();
for (Test test : Global.testingServer.db.tests.Data.values()) { for (Test test : Global.testingServer.db.tests.Data.values()) {
if (test.group_id==group.id) { if (test.group_id == group.id) {
if (test.isSelected()) if (test.isSelected())
selected_tests.add(test); selected_tests.add(test);
else else
@@ -248,6 +235,12 @@ public class MainForm extends Form implements MainWindow {
globalTabs.setSelectedIndex(4); globalTabs.setSelectedIndex(4);
} }
@Override @Override
public void SwitchTestingTabs(boolean flag) {
globalTabs.setEnabledAt(2, flag);
globalTabs.setEnabledAt(3, flag);
globalTabs.setEnabledAt(4, flag);
}
@Override
public TestingWindow getTestingWindow() { public TestingWindow getTestingWindow() {
return testingForm; return testingForm;
} }