amend-OOZIE-2691 Show workflow action retry information in UI

Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/6fa03855
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/6fa03855
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/6fa03855

Branch: refs/heads/master
Commit: 6fa03855cfd32f2a5d47c9030207cc1c1a544486
Parents: c52967d
Author: puru <[email protected]>
Authored: Sun Jan 29 19:11:40 2017 -0800
Committer: puru <[email protected]>
Committed: Sun Jan 29 19:11:40 2017 -0800

----------------------------------------------------------------------
 client/src/main/java/org/apache/oozie/cli/OozieCLI.java | 2 +-
 webapp/src/main/webapp/oozie-console.js                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oozie/blob/6fa03855/client/src/main/java/org/apache/oozie/cli/OozieCLI.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/oozie/cli/OozieCLI.java 
b/client/src/main/java/org/apache/oozie/cli/OozieCLI.java
index f78c3aa..b0b87ad 100644
--- a/client/src/main/java/org/apache/oozie/cli/OozieCLI.java
+++ b/client/src/main/java/org/apache/oozie/cli/OozieCLI.java
@@ -1499,7 +1499,7 @@ public class OozieCLI {
         System.out.println("External ID       : " + 
maskIfNull(action.getExternalId()));
         System.out.println("External Status   : " + 
maskIfNull(action.getExternalStatus()));
         System.out.println("Name              : " + 
maskIfNull(action.getName()));
-        System.out.println("Retries           : " + action.getRetries());
+        System.out.println("Retries           : " + 
action.getUserRetryCount());
         System.out.println("Tracker URI       : " + 
maskIfNull(action.getTrackerUri()));
         System.out.println("Type              : " + 
maskIfNull(action.getType()));
         System.out.println("Started           : " + 
maskDate(action.getStartTime(), timeZoneId, verbose));

http://git-wip-us.apache.org/repos/asf/oozie/blob/6fa03855/webapp/src/main/webapp/oozie-console.js
----------------------------------------------------------------------
diff --git a/webapp/src/main/webapp/oozie-console.js 
b/webapp/src/main/webapp/oozie-console.js
index 38989c7..76864a9 100644
--- a/webapp/src/main/webapp/oozie-console.js
+++ b/webapp/src/main/webapp/oozie-console.js
@@ -848,7 +848,7 @@ function jobDetailsPopup(response, request) {
                         value: retriesObj[key],
                         triggerClass: 'x-form-search-trigger',
                         onTriggerClick: function() {
-                            window.open(retriesObj[text]);
+                            window.open(retriesObj[key]);
                         }
                     });
                     form.add(textUrl);

Reply via email to