no message
This commit is contained in:
@@ -116,7 +116,7 @@ public class DataSetControlForm<D extends DBObject> extends ControlForm<DataTabl
|
||||
return null;
|
||||
}
|
||||
public boolean isObjectVisible(D object){
|
||||
return true;
|
||||
return ApplyFilters(object);
|
||||
}
|
||||
Vector<Object> getVisibleKeys() {
|
||||
Comparator comparator = getDefaultComparator();
|
||||
|
||||
@@ -49,6 +49,6 @@ public class CompilersForm extends DataSetControlForm<Compiler> {
|
||||
}
|
||||
@Override
|
||||
public boolean isObjectVisible(Compiler object) {
|
||||
return MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
|
||||
return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -33,6 +33,6 @@ public class EnvironmentsValuesForm extends DataSetControlForm<EnvironmentValue>
|
||||
}
|
||||
@Override
|
||||
public boolean isObjectVisible(EnvironmentValue object) {
|
||||
return MainModule_.instance.matchCurrentID(Current.RunConfiguration, object.run_configuration_id);
|
||||
return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.RunConfiguration, object.run_configuration_id);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -44,6 +44,7 @@ public class MakefilesForm extends DataSetControlForm<Makefile> {
|
||||
}
|
||||
@Override
|
||||
public boolean isObjectVisible(Makefile object) {
|
||||
return MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
|
||||
return super.isObjectVisible(object)&&
|
||||
MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ public class ModulesForm extends DataSetControlForm<Module> {
|
||||
}
|
||||
@Override
|
||||
public boolean isObjectVisible(Module object) {
|
||||
return MainModule_.instance.matchCurrentID(Current.Makefile, object.makefile_id);
|
||||
return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.Makefile, object.makefile_id);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -44,6 +44,6 @@ public class RunConfigurationsForm extends DataSetControlForm<RunConfiguration>
|
||||
}
|
||||
@Override
|
||||
public boolean isObjectVisible(RunConfiguration object) {
|
||||
return MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
|
||||
return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,6 +28,6 @@ public class SapforProfileSettingsForm extends DataSetControlForm<SapforProfileS
|
||||
}
|
||||
@Override
|
||||
public boolean isObjectVisible(SapforProfileSetting object) {
|
||||
return MainModule_.instance.matchCurrentID(Current.SapforProfile, object.sapforprofile_id);
|
||||
return super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.SapforProfile, object.sapforprofile_id);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -57,7 +57,8 @@ public class CompilationTasksForm extends DataSetControlForm<CompilationTask> {
|
||||
}
|
||||
@Override
|
||||
public boolean isObjectVisible(CompilationTask object) {
|
||||
return MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id) &&
|
||||
return super.isObjectVisible(object)&&
|
||||
MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id) &&
|
||||
MainModule_.instance.matchCurrentID(Current.User, object.user_id) &&
|
||||
Global.mainModule.HasProject() &&
|
||||
object.belongsToProject(Global.mainModule.getProject());
|
||||
|
||||
@@ -51,7 +51,7 @@ public class RunTasksForm extends DataSetControlForm<RunTask> {
|
||||
}
|
||||
@Override
|
||||
public boolean isObjectVisible(RunTask object) {
|
||||
return
|
||||
return super.isObjectVisible(object)&&
|
||||
MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id) &&
|
||||
MainModule_.instance.matchCurrentID(Current.User, object.user_id) &&
|
||||
MainModule_.instance.matchCurrentID(Current.RunConfiguration, object.run_configuration_id) &&
|
||||
|
||||
@@ -50,6 +50,6 @@ public class UsersForm extends DataSetControlForm<User> {
|
||||
|
||||
@Override
|
||||
public boolean isObjectVisible(User object) {
|
||||
return MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
|
||||
return super.isObjectVisible(object)&&super.isObjectVisible(object)&&MainModule_.instance.matchCurrentID(Current.Machine, object.machine_id);
|
||||
}
|
||||
}
|
||||
@@ -49,7 +49,7 @@ public class MessagesControlForm extends DataSetControlForm<Message> {
|
||||
}
|
||||
@Override
|
||||
public boolean isObjectVisible(Message object) {
|
||||
return true;
|
||||
return super.isObjectVisible(object);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -41,11 +41,14 @@ public class ProjectArraysForm extends DataSetControlForm<ProjectArray> {
|
||||
}
|
||||
@Override
|
||||
public boolean isObjectVisible(ProjectArray object) {
|
||||
if (object.isTemplFlag > 0) return true;
|
||||
return object.shortName.startsWith(object.filterName) &&
|
||||
object.location.toString().startsWith(object.filterLocation) &&
|
||||
object.locName.startsWith(object.filterLocationName) &&
|
||||
object.has_decl_place(object.filterFile) &&
|
||||
object.has_region(object.filterRegion);
|
||||
if (super.isObjectVisible(object)) {
|
||||
if (object.isTemplFlag > 0) return true;
|
||||
return object.shortName.startsWith(object.filterName) &&
|
||||
object.location.toString().startsWith(object.filterLocation) &&
|
||||
object.locName.startsWith(object.filterLocationName) &&
|
||||
object.has_decl_place(object.filterFile) &&
|
||||
object.has_region(object.filterRegion);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -84,6 +84,6 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
|
||||
}
|
||||
@Override
|
||||
public boolean isObjectVisible(BugReport object) {
|
||||
return BugReportInterface.isVisible(object);
|
||||
return super.isObjectVisible(object)&&BugReportInterface.isVisible(object);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ public class SubscriberWorkspacesForm extends DataSetControlForm<SubscriberWorks
|
||||
}
|
||||
@Override
|
||||
public boolean isObjectVisible(SubscriberWorkspace object) {
|
||||
return Global.mainModule.HasSubscriber() && Global.mainModule.getSubscriber().address.equals(object.email) &&
|
||||
return super.isObjectVisible(object)&&Global.mainModule.HasSubscriber() && Global.mainModule.getSubscriber().address.equals(object.email) &&
|
||||
(Global.mainModule.getAccount().isAdmin() || Global.mainModule.getAccount().email.equals(Global.mainModule.getSubscriber().address));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user