Merge pull request #8 from fbelzunc/JENKINS-26489

[FIXED JENKINS-26489] Action report for the bitbucket polling log on web UI
jenkinsci · Feb 5, 2015 · c70f028 · c70f028
2 parents 284d448 + 0f39f81
commit c70f028
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/BitBucketTrigger.java b/src/main/java/com/cloudbees/jenkins/plugins/BitBucketTrigger.java
@@ -19,6 +19,8 @@
 import java.io.PrintStream;
 import java.nio.charset.Charset;
 import java.text.DateFormat;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -91,6 +93,11 @@ public void run() {
         });
     }
 
+    @Override
+    public Collection<? extends Action> getProjectActions() {
+        return Collections.singleton(new BitBucketWebHookPollingAction());
+    }
+
     /**
      * Returns the file that records the last/current polling activity.
      */

diff --git a/.../com/cloudbees/jenkins/plugins/BitBucketTrigger/BitBucketWebHookPollingAction/index.jelly b/.../com/cloudbees/jenkins/plugins/BitBucketTrigger/BitBucketWebHookPollingAction/index.jelly
@@ -0,0 +1,20 @@
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+    <l:layout>
+        <st:include it="${it.owner}" page="sidepanel.jelly" />
+        <l:main-panel>
+            <h1>${%Last BitBucket Push}</h1>
+            <j:set var="log" value="${it.log}" />
+            <j:choose>
+                <j:when test="${empty(log)}">
+                    ${%Polling has not run yet.}
+                </j:when>
+                <j:otherwise>
+                    <pre>
+                        <st:getOutput var="output" />
+                        <j:whitespace>${it.writeLogTo(output)}</j:whitespace>
+                    </pre>
+                </j:otherwise>
+            </j:choose>
+        </l:main-panel>
+    </l:layout>
+</j:jelly>