From 3aa239309181d04dc6831b22c8abb0bbf85cb657 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 24 Jan 2022 16:11:52 -0500
Subject: [PATCH] Jobsets: add a supportsDynamicRunCommand which also checks
 the project's dynamic runcommand support

---
 src/lib/Hydra/Plugin/RunCommand.pm     | 6 +-----
 src/lib/Hydra/Schema/Result/Jobsets.pm | 7 +++++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/lib/Hydra/Plugin/RunCommand.pm b/src/lib/Hydra/Plugin/RunCommand.pm
index 9e173278..2b3bb6f4 100644
--- a/src/lib/Hydra/Plugin/RunCommand.pm
+++ b/src/lib/Hydra/Plugin/RunCommand.pm
@@ -71,11 +71,7 @@ sub isBuildEligibleForDynamicRunCommand {
             return 0;
         }
 
-        if (! $build->jobset->enable_dynamic_run_command) {
-            return 0;
-        }
-
-        if (! $build->project->supportsDynamicRunCommand()) {
+        if (! $build->jobset->supportsDynamicRunCommand()) {
             return 0;
         }
 
diff --git a/src/lib/Hydra/Schema/Result/Jobsets.pm b/src/lib/Hydra/Schema/Result/Jobsets.pm
index 7b96c472..cd704ac8 100644
--- a/src/lib/Hydra/Schema/Result/Jobsets.pm
+++ b/src/lib/Hydra/Schema/Result/Jobsets.pm
@@ -386,6 +386,13 @@ __PACKAGE__->add_column(
     "+id" => { retrieve_on_insert => 1 }
 );
 
+sub supportsDynamicRunCommand {
+  my ($self) = @_;
+
+  return $self->get_column('enable_dynamic_run_command') == 1
+    && $self->project->supportsDynamicRunCommand();
+}
+
 sub as_json {
     my $self = shift;