From d596b5899145f4ec41b2fd4667e46e3ded85f38d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Feb 2013 16:56:19 +0100
Subject: [PATCH] "Evaluate" command: push the jobset to the front of the eval
 queue

Don't let hydra-server call hydra-evaluate.  That will probably just
timeout, get killed, etc.
---
 src/lib/Hydra/Controller/Admin.pm     | 17 -----------------
 src/lib/Hydra/Helper/CatalystUtils.pm |  1 +
 src/root/layout.tt                    |  2 ++
 src/root/topbar.tt                    | 23 +++++++++++++++++++++--
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/lib/Hydra/Controller/Admin.pm b/src/lib/Hydra/Controller/Admin.pm
index 4ffd77ee..7e8e4245 100644
--- a/src/lib/Hydra/Controller/Admin.pm
+++ b/src/lib/Hydra/Controller/Admin.pm
@@ -392,21 +392,4 @@ sub news_delete : Chained('admin') Path('news/delete') Args(1) {
 }
 
 
-sub force_eval : Chained('admin') Path('eval') Args(2) {
-    my ($self, $c, $projectName, $jobsetName) = @_;
-
-    my $project = $c->model('DB::Projects')->find($projectName)
-        or notFound($c, "Project $projectName doesn't exist.");
-
-    $c->stash->{project} = $project;
-    $c->stash->{jobset_} = $project->jobsets->search({name => $jobsetName});
-    $c->stash->{jobset} = $c->stash->{jobset_}->single
-        or notFound($c, "Jobset $jobsetName doesn't exist.");
-
-    captureStdoutStderr(60, "hydra-evaluator", $projectName, $jobsetName);
-
-    $c->res->redirect("/project/$projectName");
-}
-
-
 1;
diff --git a/src/lib/Hydra/Helper/CatalystUtils.pm b/src/lib/Hydra/Helper/CatalystUtils.pm
index 65398954..aefddceb 100644
--- a/src/lib/Hydra/Helper/CatalystUtils.pm
+++ b/src/lib/Hydra/Helper/CatalystUtils.pm
@@ -1,5 +1,6 @@
 package Hydra::Helper::CatalystUtils;
 
+use utf8;
 use strict;
 use Exporter;
 use Readonly;
diff --git a/src/root/layout.tt b/src/root/layout.tt
index e9c3b56b..3fabfa58 100644
--- a/src/root/layout.tt
+++ b/src/root/layout.tt
@@ -79,6 +79,8 @@
                 window.location = link.attr("href");
           });
 
+          bootbox.animate(false);
+
       });
 
     </script>
diff --git a/src/root/topbar.tt b/src/root/topbar.tt
index 7ac4b43a..a1f56455 100644
--- a/src/root/topbar.tt
+++ b/src/root/topbar.tt
@@ -95,8 +95,27 @@
         [% INCLUDE menuItem title="Delete" uri = "javascript:confirmDeleteJobset()" %]
 
         [% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'clone') title="Clone" %]
-        [% INCLUDE maybeLink uri = c.uri_for(c.controller('Admin').action_for('force_eval'), project.name, jobset.name)
-          content = "Evaluate" confirmmsg = ("Are you sure you want to force evaluation of jobset " _ project.name _ ":" _ jobset.name _ "?") class = "" %]
+
+        <script>
+          function confirmEvaluateJobset() {
+            bootbox.confirm(
+              'Are you sure you want to force evaluation of this jobset?',
+              function(c) {
+                if (!c) return;
+                $.post("[% c.uri_for('/api/push', { jobsets = project.name _ ':' _ jobset.name }) %]")
+                  .done(function(data) {
+                    if (data.error)
+                      bootbox.alert("Unable to schedule the jobset for evaluation: " + data.error);
+                    else
+                      bootbox.alert("The jobset has been scheduled for evaluation.");
+                  })
+                  .fail(function() { bootbox.alert("Server request failed!"); });
+              });
+            return;
+          };
+        </script>
+        [% INCLUDE menuItem title="Evaluate" uri = "javascript:confirmEvaluateJobset()" %]
+
       [% END %]
     [% END %]
   [% END %]