Author: rkanter
Date: Mon Feb 4 18:03:42 2013
New Revision: 1442270
URL: http://svn.apache.org/viewvc?rev=1442270&view=rev
Log:
OOZIE-1053 Oozie Web-console clicking on Bundle's coord jobs does not open them
up (ryota via mona)
Modified:
oozie/branches/branch-3.3/release-log.txt
oozie/branches/branch-3.3/webapp/src/main/webapp/oozie-console.js
Modified: oozie/branches/branch-3.3/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/release-log.txt?rev=1442270&r1=1442269&r2=1442270&view=diff
==============================================================================
--- oozie/branches/branch-3.3/release-log.txt (original)
+++ oozie/branches/branch-3.3/release-log.txt Mon Feb 4 18:03:42 2013
@@ -1,5 +1,6 @@
-- Oozie 3.3.2 (unreleased)
+OOZIE-1053 Oozie Web-console clicking on Bundle's coord jobs does not open
them up (ryota via mona)
OOZIE-1166 Print a more helpful message when ProxyUserService is configured
wrong (rkanter)
OOZIE-1136 Fix MiniOozie (rkanter)
OOZIE-1051 Repeating Errors for workflows that were allreday Killed (rkanter)
Modified: oozie/branches/branch-3.3/webapp/src/main/webapp/oozie-console.js
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/webapp/src/main/webapp/oozie-console.js?rev=1442270&r1=1442269&r2=1442270&view=diff
==============================================================================
--- oozie/branches/branch-3.3/webapp/src/main/webapp/oozie-console.js (original)
+++ oozie/branches/branch-3.3/webapp/src/main/webapp/oozie-console.js Mon Feb
4 18:03:42 2013
@@ -80,7 +80,7 @@ function checkUrl(value, metadata, recor
return "N";
}
}
-
+
function getTimeZone() {
Ext.state.Manager.setProvider(new Ext.state.CookieProvider());
return Ext.state.Manager.get("TimezoneId","GMT");
@@ -1048,7 +1048,6 @@ function coordJobDetailsPopup(response,
}
function bundleJobDetailsPopup(response, request) {
-
var jobDefinitionArea = new Ext.form.TextArea({
fieldLabel: 'Definition',
editable: false,
@@ -1113,7 +1112,7 @@ function bundleJobDetailsPopup(response,
value: jobDetails["group"]
}, ]
});
-
+
var fs = new Ext.FormPanel({
frame: true,
labelAlign: 'right',
@@ -1137,7 +1136,7 @@ function bundleJobDetailsPopup(response,
}]
});
-
+
var coord_jobs_grid = new Ext.grid.GridPanel({
store: jobActionStatus,
loadMask: true,
@@ -1200,10 +1199,14 @@ function bundleJobDetailsPopup(response,
height: 400,
width: 1000,
title: 'Coord Jobs',
- bbar: getPagingBar(jobActionStatus)
-
+ bbar: getPagingBar(jobActionStatus),
+ listeners: {
+ cellclick: {
+ fn: showCoordJobContextMenu
+ }
+ }
});
-
+
var jobDetailsTab = new Ext.TabPanel({
activeTab: 0,
autoHeight: true,
@@ -1213,7 +1216,7 @@ function bundleJobDetailsPopup(response,
items: fs
}]
});
-
+
jobDetailsTab.addListener("tabchange", function(panel, selectedTab) {
if (selectedTab.title == "Bundle Job Info") {
coord_jobs_grid.setVisible(true);
@@ -1732,25 +1735,25 @@ var timeZones_store = new Ext.data.JsonS
});
timeZones_store.proxy.conn.method = "GET";
+function showCoordJobContextMenu(thisGrid, rowIndex, cellIndex, e) {
+ var jobContextMenu = new Ext.menu.Menu('taskContext');
+ var coordJobId = thisGrid.store.data.items[rowIndex].data.coordJobId;
+ coordJobDetailsGridWindow(coordJobId);
+}
+
function initConsole() {
function showJobContextMenu(thisGrid, rowIndex, cellIndex, e) {
var jobContextMenu = new Ext.menu.Menu('taskContext');
var workflowId = thisGrid.store.data.items[rowIndex].data.id;
jobDetailsGridWindow(workflowId);
}
-
- function showCoordJobContextMenu(thisGrid, rowIndex, cellIndex, e) {
- var jobContextMenu = new Ext.menu.Menu('taskContext');
- var coordJobId = thisGrid.store.data.items[rowIndex].data.coordJobId;
- coordJobDetailsGridWindow(coordJobId);
- }
-
+
function showBundleJobContextMenu(thisGrid, rowIndex, cellIndex, e) {
var jobContextMenu = new Ext.menu.Menu('taskContext');
var bundleJobId = thisGrid.store.data.items[rowIndex].data.bundleJobId;
bundleJobDetailsGridWindow(bundleJobId);
}
-
+
var jobs_grid = new Ext.grid.GridPanel({
store: jobs_store,
loadMask: true,
@@ -1897,7 +1900,7 @@ function initConsole() {
header: "Status",
width: 80,
sortable: true,
- dataIndex: 'status'
+ dataIndex: 'status'
}, {
header: "User",
width: 80,
@@ -1993,7 +1996,7 @@ function initConsole() {
width: 170,
sortable: true,
dataIndex: 'kickoffTime'
- }, {
+ }, {
header: "Created Time",
width: 170,
sortable: true,
@@ -2041,7 +2044,7 @@ function initConsole() {
editable: false,
triggerAction: 'all',
value: currentTimezone,
- listeners:
+ listeners:
{ select: { fn:function(combo, value)
{
Ext.state.Manager.setProvider(new
Ext.state.CookieProvider());
