From 42ed7cf4deea125fd6c68fe916b41d85c81d053f Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 19 Feb 2013 22:02:46 +0100 Subject: [PATCH] Make sure that repo has a slug when creating a link to repo Raw repo data is sometimes passed to linkTo helpers and in such case Repo instance is created by id and it does not include slug. This commit will be reverted after fixing "incomplete" implementation, which will allow to preload Repo with both id and slug before searching for it. --- assets/scripts/app/templates/jobs/list.hbs | 2 +- assets/scripts/app/templates/jobs/show.hbs | 4 +++- assets/scripts/app/templates/repos/list.hbs | 8 ++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/assets/scripts/app/templates/jobs/list.hbs b/assets/scripts/app/templates/jobs/list.hbs index 078344eb..71aca67c 100644 --- a/assets/scripts/app/templates/jobs/list.hbs +++ b/assets/scripts/app/templates/jobs/list.hbs @@ -24,7 +24,7 @@ {{#if job.id}} - {{#if job.repo}} + {{#if job.repo.slug}} {{#linkTo "job" repo job}}{{number}}{{/linkTo}} {{/if}} {{/if}} diff --git a/assets/scripts/app/templates/jobs/show.hbs b/assets/scripts/app/templates/jobs/show.hbs index 9fd42deb..f34acb86 100644 --- a/assets/scripts/app/templates/jobs/show.hbs +++ b/assets/scripts/app/templates/jobs/show.hbs @@ -6,7 +6,9 @@
{{#if job.id}} - {{#linkTo job repo job}}{{job.number}}{{/linkTo}} + {{#if job.repo.slug}} + {{#linkTo job repo job}}{{job.number}}{{/linkTo}} + {{/if}} {{/if}}
{{t jobs.state}}
diff --git a/assets/scripts/app/templates/repos/list.hbs b/assets/scripts/app/templates/repos/list.hbs index 93d276cc..dd0cc033 100644 --- a/assets/scripts/app/templates/repos/list.hbs +++ b/assets/scripts/app/templates/repos/list.hbs @@ -9,10 +9,14 @@ {{#with view.repo}}
- {{#linkTo repo this class="slug"}}{{slug}}{{/linkTo}} + {{#if slug}} + {{#linkTo repo this class="slug"}}{{slug}}{{/linkTo}} + {{/if}}
{{#with lastBuildHash}} - {{#linkTo build repo id class="last_build"}}{{number}}{{/linkTo}} + {{#if repo.slug}} + {{#linkTo build repo id class="last_build"}}{{number}}{{/linkTo}} + {{/if}} {{/with}}