From e68ae7145bbe75381c5535a4dd6f434c197363e3 Mon Sep 17 00:00:00 2001 From: Jeff Storey Date: Tue, 29 Mar 2016 18:40:24 -0400 Subject: [PATCH 1/2] changing text based on whether this was a deployment --- static/scripts/repo.js | 11 +++++++++-- template/amber/build.amber | 10 ++++++++-- template/amber/repo.amber | 10 ++++++++-- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/static/scripts/repo.js b/static/scripts/repo.js index 9f89105c5..47d456fac 100644 --- a/static/scripts/repo.js +++ b/static/scripts/repo.js @@ -19,6 +19,13 @@ function RepoViewModel(repo) { // construct the build entry if it doesn't already exist // so that we can append to the DOM. The code may not be // pretty, but it is simple enough and it works. + authoredOrDeployed = "authored" + branchOrDeploy = data.branch + if ( data.event == "deployment" ) { + authoredOrDeployed = "deployed" + branchOrDeploy = data.deploy_to + } + el = $("").attr("class", "card").attr("href", "/"+repo+"/"+data.number).attr("data-build", data.number) .append( $("
").attr("class", "card-header").append( @@ -36,13 +43,13 @@ function RepoViewModel(repo) { $("

").attr("class","card-text").append( $("").text(data.author) ).append( - $("").text("authored") + $("").text(authoredOrDeployed) ).append( $("").attr("data-livestamp", data.created_at) ).append( $("").text("to") ).append( - $("").text(data.branch) + $("").text(branchOrDeploy) ) ) ).css("display", "flex").hide().fadeIn(1000); diff --git a/template/amber/build.amber b/template/amber/build.amber index 3d8cbc8d0..55a117c8b 100644 --- a/template/amber/build.amber +++ b/template/amber/build.amber @@ -26,10 +26,16 @@ block content a.material-icons[href=Build.Link][target="_blank"] link p em #{Build.Author} - span authored + if Build.Event != "deployment" + span authored + else + span deployed em[data-livestamp=Build.Created] span to - em #{Build.Branch} + if Build.Event != "deployment" + em #{Build.Branch} + else + em #{Build.Deploy} diff --git a/template/amber/repo.amber b/template/amber/repo.amber index d7358c69b..dd1fd79c6 100644 --- a/template/amber/repo.amber +++ b/template/amber/repo.amber @@ -42,10 +42,16 @@ block content h3 #{$build.Message} p.card-text em #{$build.Author} - span authored + if $build.Event != "deployment" + span authored + else + span deployed em[data-livestamp=$build.Created] span to - em #{$build.Branch} + if $build.Event != "deployment" + em ${build.Branch} + else + em #{$build.Deploy} block append scripts From 442fc72eee0187f0d10ee0cfa155e16493137e23 Mon Sep 17 00:00:00 2001 From: Jeff Storey Date: Wed, 30 Mar 2016 08:02:42 -0400 Subject: [PATCH 2/2] variable scoping --- static/scripts/repo.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/scripts/repo.js b/static/scripts/repo.js index 47d456fac..582e8d1dc 100644 --- a/static/scripts/repo.js +++ b/static/scripts/repo.js @@ -19,8 +19,8 @@ function RepoViewModel(repo) { // construct the build entry if it doesn't already exist // so that we can append to the DOM. The code may not be // pretty, but it is simple enough and it works. - authoredOrDeployed = "authored" - branchOrDeploy = data.branch + var authoredOrDeployed = "authored" + var branchOrDeploy = data.branch if ( data.event == "deployment" ) { authoredOrDeployed = "deployed" branchOrDeploy = data.deploy_to