Skip to content

[TBT-467] Fix job navigation #3028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mshahzaib-travis wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −7
Open

[TBT-467] Fix job navigation #3028

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions app/routes/job.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,17 @@ export default TravisRoute.extend({
};
},

setupController(controller, model) {
async setupController(controller, model) {
let buildController, repo;

if (model && !model.get) {
model = this.store.peekRecord('job', model);
this.store.find('job', model);
model = await this.store.findRecord('job', model, { reload: true });
}
repo = this.controllerFor('repo');
controller.set('job', model);
repo.activate('job');
buildController = this.controllerFor('build');
model.get('repo');
await model.get('repo');
let buildPromise = model.get('build');
if (buildPromise) {
buildPromise.then(build => {
Expand All @@ -46,11 +45,15 @@ export default TravisRoute.extend({
return this.store.findRecord('job', params.job_id);
},

afterModel(job) {
async afterModel(job) {
const slug = this.modelFor('repo').get('slug');

await job.get('repo');

this.ensureJobOwnership(job, slug);

job.get('build').then((build) => {
if (build.request) {
if (build && build.request) {
build.request.fetchMessages.perform();
}
});
Expand All @@ -67,7 +70,7 @@ export default TravisRoute.extend({
const jobSlug = job.get('repositorySlug') || job.get('repo.slug');
const repoVcsSlug = job.get('repo.vcsSlug');
if (jobSlug !== urlSlug && repoVcsSlug !== urlSlug) {
throw new Error('invalidJobId');
return;
}
},

Expand Down