azkaban-aplcache
Changes
src/tl/flowsummary.tl 1(+0 -1)
src/web/js/azkaban/view/flow.js 4(+2 -2)
src/web/js/azkaban/view/job-details.js 10(+5 -5)
Details
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
index 0a88c63..50858db 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
@@ -80,8 +80,8 @@
## Tabs
<ul class="nav nav-tabs" id="headertabs">
- <li id="jobSummaryViewLink"><a href="#jobsummary">Summary</a></li>
- <li id="jobLogViewLink"><a href="#joblog">Log</a></li>
+ <li id="jobLogViewLink"><a href="#logs">Job Logs</a></li>
+ <li id="jobSummaryViewLink"><a href="#summary">Summary</a></li>
<li><a href="${context}/pigvisualizer?execid=${execid}&jobid=${jobid}">Visualization</a></li>
</ul>
</div>
src/tl/flowsummary.tl 1(+0 -1)
diff --git a/src/tl/flowsummary.tl b/src/tl/flowsummary.tl
index 1c9154f..30c50de 100644
--- a/src/tl/flowsummary.tl
+++ b/src/tl/flowsummary.tl
@@ -14,7 +14,6 @@
</table>
</div>
</div>
- <hr>
<div class="row">
<div class="col-xs-12">
src/web/js/azkaban/view/flow.js 4(+2 -2)
diff --git a/src/web/js/azkaban/view/flow.js b/src/web/js/azkaban/view/flow.js
index b8348d4..14ee620 100644
--- a/src/web/js/azkaban/view/flow.js
+++ b/src/web/js/azkaban/view/flow.js
@@ -291,7 +291,6 @@ azkaban.SummaryView = Backbone.View.extend({
this.fetchDetails();
this.fetchSchedule();
- this.fetchLastRun();
this.model.trigger('render');
},
@@ -314,7 +313,8 @@ azkaban.SummaryView = Backbone.View.extend({
};
$.get(requestURL, requestData, successHandler, 'json');
},
- fetchSchedule: function() {
+
+ fetchSchedule: function() {
var requestURL = contextURL + "/schedule"
var requestData = {
'ajax': 'fetchSchedule',
src/web/js/azkaban/view/job-details.js 10(+5 -5)
diff --git a/src/web/js/azkaban/view/job-details.js b/src/web/js/azkaban/view/job-details.js
index f191f37..e3fbd00 100644
--- a/src/web/js/azkaban/view/job-details.js
+++ b/src/web/js/azkaban/view/job-details.js
@@ -206,11 +206,11 @@ azkaban.JobTabView = Backbone.View.extend({
initialize: function(settings) {
var selectedView = settings.selectedView;
- if (selectedView == 'joblog') {
- this.handleJobLogViewLinkClick();
+ if (selectedView == 'summary') {
+ this.handleJobSummaryViewLinkClick();
}
else {
- this.handleJobSummaryViewLinkClick();
+ this.handleJobLogViewLinkClick();
}
},
@@ -266,10 +266,10 @@ $(function() {
if (window.location.hash) {
var hash = window.location.hash;
- if (hash == '#joblog') {
+ if (hash == '#logs') {
jobTabView.handleJobLogViewLinkClick();
}
- else if (hash == '#jobsummary') {
+ else if (hash == '#summary') {
jobTabView.handleJobSummaryViewLinkClick();
}
}