Skip to content

Commit ea50b01

Browse files
committed
fix linking to individual failed jobs in the jobs admin ui
Change-Id: I9f9c9248b973182b5b5493b568a3ed2de46cffbe Reviewed-on: https://gerrit.instructure.com/4313 Tested-by: Hudson <hudson@instructure.com> Reviewed-by: Zach Wily <zach@instructure.com>
1 parent c7b5753 commit ea50b01

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

app/coffeescripts/jobs.coffee

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ I18n.scoped 'jobs', (I18n) ->
126126
$('#show-job .show-field').each (idx, field) =>
127127
field_name = field.id.replace("job-", '')
128128
$(field).text(job[field_name] || '')
129-
$('#job-id-link').attr('href', "/jobs?id=#{job.id}")
129+
$('#job-id-link').attr('href', "/jobs?id=#{job.id}&flavor=#{@options.flavor}")
130130
if @data.length == 1 && @type_name == 'jobs'
131131
@grid.setSelectedRows [0]
132132
@grid.onSelectedRowsChanged()

app/controllers/jobs_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def index
1010

1111
if params[:id].present?
1212
params[:q] = params[:id]
13-
params[:flavor] = 'all'
13+
params[:flavor] = params[:flavor] == 'failed' ? params[:flavor] : 'all'
1414
end
1515

1616
jobs_scope

public/javascripts/jobs.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/* DO NOT MODIFY. This file was compiled Tue, 14 Jun 2011 03:22:51 GMT from
2-
* /Users/jon/Dropbox/git/canvas-lms/app/coffeescripts/jobs.coffee
1+
/* DO NOT MODIFY. This file was compiled Tue, 21 Jun 2011 18:12:09 GMT from
2+
* /Users/bpalmer/Programming/canvas/app/coffeescripts/jobs.coffee
33
*/
44

55
(function() {
@@ -201,7 +201,7 @@
201201
field_name = field.id.replace("job-", '');
202202
return $(field).text(job[field_name] || '');
203203
}, this));
204-
return $('#job-id-link').attr('href', "/jobs?id=" + job.id);
204+
return $('#job-id-link').attr('href', "/jobs?id=" + job.id + "&flavor=" + this.options.flavor);
205205
}, this);
206206
if (this.data.length === 1 && this.type_name === 'jobs') {
207207
this.grid.setSelectedRows([0]);

0 commit comments

Comments
 (0)