no message

This commit is contained in:
2024-10-20 21:06:15 +03:00
parent b40328f931
commit 99643aa755
21 changed files with 36 additions and 63 deletions

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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());

View File

@@ -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) &&

View File

@@ -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);
}
}