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

no message

Browse Source
This commit is contained in:
02090095
2024-10-20 21:06:15 +03:00
parent b40328f931
commit 99643aa755
21 changed files with 36 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/_VisualDVM/TestingSystem/Common/Group/UI/GroupsForm.java
View File

@@ -33,7 +33,8 @@ public class GroupsForm extends DataSetControlForm<Group> {
}
@Override
public boolean isObjectVisible(Group object) {
return (!GroupsDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) &&
return super.isObjectVisible(object)&&
(!GroupsDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) &&
Global.testingServer.db.groups.getUI().ApplyFilters(object);
}
@Override

2
src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java
View File

@@ -39,7 +39,7 @@ public class TestsForm extends DataSetControlForm<Test> {
}
@Override
public boolean isObjectVisible(Test object) {
return MainModule_.instance.matchCurrentID(Current.Group, object.group_id);
return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.Group, object.group_id);
}
};

2
src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
View File

@@ -121,7 +121,7 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
}
@Override
public boolean isObjectVisible(DVMPackage object) {
return (!DVMPackageDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) &&
return super.isObjectVisible(object)&&(!DVMPackageDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) &&
(!DVMPackageDBTable.filterActive || object.state.isActive());
}
}

2
src/_VisualDVM/TestingSystem/DVM/DVMTasks/UI/DVMRunTasksForm.java
View File

@@ -92,6 +92,6 @@ public class DVMRunTasksForm extends DataSetControlForm<DVMRunTask> {
}
@Override
public boolean isObjectVisible(DVMRunTask object) {
return Global.testingServer.db.dvmRunTasks.getUI().ApplyFilters(object);
return super.isObjectVisible(object)&&Global.testingServer.db.dvmRunTasks.getUI().ApplyFilters(object);
}
}

3
src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
View File

@@ -104,7 +104,8 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
}
@Override
public boolean isObjectVisible(SapforPackage object) {
return (!SapforPackageDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) &&
return super.isObjectVisible(object)&&
(!SapforPackageDBTable.filterMyOnly || Global.mainModule.getAccount().email.equals(object.sender_address)) &&
(!SapforPackageDBTable.filterActive || object.state.isActive());
}
}

2
src/_VisualDVM/TestingSystem/SAPFOR/SapforSettingsCommand/UI/SapforSettingsCommandsForm.java
View File

@@ -32,6 +32,6 @@ public class SapforSettingsCommandsForm extends DataSetControlForm<SapforSetting
@Override
public boolean isObjectVisible(SapforSettingsCommand object) {
return MainModule_.instance.matchCurrentID(Current.SapforSettings, object.sapforsettings_id);
return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.SapforSettings, object.sapforsettings_id);
}
}