From c0a681e73b56d372777e3f007b65c086cf66b5e7 Mon Sep 17 00:00:00 2001 From: Lisa P Date: Thu, 8 Jan 2015 15:38:46 +0100 Subject: [PATCH 1/4] add popup stub --- assets/scripts/app/templates/remove_log.hbs | 8 ++++++++ assets/styles/app/popup.sass | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 assets/scripts/app/templates/remove_log.hbs diff --git a/assets/scripts/app/templates/remove_log.hbs b/assets/scripts/app/templates/remove_log.hbs new file mode 100644 index 00000000..ad8e2fa7 --- /dev/null +++ b/assets/scripts/app/templates/remove_log.hbs @@ -0,0 +1,8 @@ + +

This action will remove the log permanently!

+

Do you want to continue?

+

+ Yes, please! + or + Cancel +

diff --git a/assets/styles/app/popup.sass b/assets/styles/app/popup.sass index 26934957..fcd6dcad 100644 --- a/assets/styles/app/popup.sass +++ b/assets/styles/app/popup.sass @@ -72,7 +72,8 @@ p:last-child margin-top: 10px -#regenerate-key +#regenerate-key, +#remove-log .cancel text-decoration: underline p @@ -108,3 +109,4 @@ padding-left: 15px img#code-climate-logo margin-right: 50px + From 97050b8111122b65845babcb6be9afe965ec7ee1 Mon Sep 17 00:00:00 2001 From: Lisa P Date: Thu, 8 Jan 2015 16:28:37 +0100 Subject: [PATCH 2/4] Add actions for remove log --- .../app/templates/repos/show/actions.hbs | 13 ++++++- assets/scripts/app/views/repo/show.coffee | 37 ++++++++++++------- 2 files changed, 35 insertions(+), 15 deletions(-) diff --git a/assets/scripts/app/templates/repos/show/actions.hbs b/assets/scripts/app/templates/repos/show/actions.hbs index 5f1232fd..28c0006d 100644 --- a/assets/scripts/app/templates/repos/show/actions.hbs +++ b/assets/scripts/app/templates/repos/show/actions.hbs @@ -39,7 +39,7 @@ {{/if}} {{#if view.displayRemoveLog}}
  • -
    • {{/if}} @@ -53,3 +53,14 @@ + + diff --git a/assets/scripts/app/views/repo/show.coffee b/assets/scripts/app/views/repo/show.coffee index d1779239..c74f92f5 100644 --- a/assets/scripts/app/views/repo/show.coffee +++ b/assets/scripts/app/views/repo/show.coffee @@ -181,7 +181,7 @@ Travis.reopen requeueJob: -> if @get('canRequeueJob') - @requeue @get('job') + @requeue @get('_job') cancelBuild: -> if @get('canCancelBuild') @@ -198,8 +198,9 @@ Travis.reopen removeLog: -> + @popupCloseAll() if @get('canRemoveLog') - job = @get('job') || @get('build.jobs.firstObject') + job = @get('_job') || @get('build.jobs.firstObject') job.removeLog().then -> Travis.flash(success: 'Log has been successfully removed.') , (xhr) -> @@ -213,7 +214,7 @@ Travis.reopen cancelJob: -> if @get('canCancelJob') Travis.flash(notice: 'Job cancellation has been scheduled.') - @get('job').cancel().then -> + @get('_job').cancel().then -> Travis.flash(success: 'Job has been successfully canceled.') , (xhr) -> if xhr.status == 422 @@ -228,6 +229,12 @@ Travis.reopen @popup('code-climate') event.stopPropagation() if event? + removeLogPopup: -> + if @get('canRemoveLog') + @set('active', true) + @popup(event) + event.stopPropagation() + hasPermission: (-> if permissions = @get('currentUser.permissions') permissions.contains parseInt(@get('repo.id')) @@ -255,19 +262,21 @@ Travis.reopen ).property('displayRequeueJob', 'hasPermission') showDownloadLog: (-> - @get('jobIdForLog') - ).property('jobIdForLog') + @get('_job') + ).property('_job') - jobIdForLog: (-> - @get('job.id') || - (@get('build.jobs.length') == 1 && @get('build.jobs').objectAt(0).get?('id')) - ).property('job.id', 'build.jobs.firstObject.id', 'build.jobs.length') - - job: (-> + _job: (-> if id = @get('jobIdForLog') Travis.Job.find(id) ).property('jobIdForLog') + jobIdForLog: (-> + job = @get('job.id') + unless job + if @get('build.jobs.length') == 1 + job = @get('build.jobs').objectAt?(0).get?('id') + job + ).property('job.id', 'build.jobs.firstObject.id', 'build.jobs.length') plainTextLogUrl: (-> if id = @get('jobIdForLog') @@ -283,9 +292,9 @@ Travis.reopen ).property('displayRemoveLog', 'hasPermission') displayRemoveLog: (-> - (@get('isJobTab') || (@get('isBuildTab') && @get('build.jobs.length') == 1)) && - @get('build.jobs').objectAt(0).get?('canRemoveLog') - ).property('isJobTab', 'isBuildTab', 'build.jobs.length', 'job.canRemoveLog') + if job = Travis.Job.find(@get('jobIdForLog')) + (@get('isJobTab') || (@get('isBuildTab') && @get('build.jobs.length') == 1)) && job.get('canRemoveLog') + ).property('isJobTab', 'isBuildTab', 'build.jobs.length', 'job.canRemoveLog', 'jobIdForLog') canCancelBuild: (-> @get('displayCancelBuild') && @get('hasPermission') From 78dccd194c1d898a643b17583ab5aebbb30463c6 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 8 Jan 2015 17:03:34 +0100 Subject: [PATCH 3/4] Bring back hack for download log button --- assets/scripts/app/templates/repos/show/actions.hbs | 10 ++++++---- assets/scripts/app/views/repo/show.coffee | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/assets/scripts/app/templates/repos/show/actions.hbs b/assets/scripts/app/templates/repos/show/actions.hbs index 28c0006d..d8c62e7f 100644 --- a/assets/scripts/app/templates/repos/show/actions.hbs +++ b/assets/scripts/app/templates/repos/show/actions.hbs @@ -32,10 +32,12 @@ {{/if}} {{/if}} - {{#if view.showDownloadLog}} -
  • - -
    • + {{#if view.jobIdForLog}} + {{#if view.showDownloadLog}} +
  • + +
    • + {{/if}} {{/if}} {{#if view.displayRemoveLog}}
  • diff --git a/assets/scripts/app/views/repo/show.coffee b/assets/scripts/app/views/repo/show.coffee index c74f92f5..65995374 100644 --- a/assets/scripts/app/views/repo/show.coffee +++ b/assets/scripts/app/views/repo/show.coffee @@ -262,8 +262,8 @@ Travis.reopen ).property('displayRequeueJob', 'hasPermission') showDownloadLog: (-> - @get('_job') - ).property('_job') + @get('jobIdForLog') + ).property('jobIdForLog') _job: (-> if id = @get('jobIdForLog') @@ -294,7 +294,7 @@ Travis.reopen displayRemoveLog: (-> if job = Travis.Job.find(@get('jobIdForLog')) (@get('isJobTab') || (@get('isBuildTab') && @get('build.jobs.length') == 1)) && job.get('canRemoveLog') - ).property('isJobTab', 'isBuildTab', 'build.jobs.length', 'job.canRemoveLog', 'jobIdForLog') + ).property('isJobTab', 'isBuildTab', 'build.jobs.length', '_job.canRemoveLog', 'jobIdForLog') canCancelBuild: (-> @get('displayCancelBuild') && @get('hasPermission') From 486e417d122710459bf81b06beaafbdb96a22fef Mon Sep 17 00:00:00 2001 From: Lisa P Date: Fri, 9 Jan 2015 15:01:07 +0100 Subject: [PATCH 4/4] some styles for remove-log-popup --- assets/styles/app/popup.sass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/assets/styles/app/popup.sass b/assets/styles/app/popup.sass index fcd6dcad..1d8c86ca 100644 --- a/assets/styles/app/popup.sass +++ b/assets/styles/app/popup.sass @@ -73,7 +73,7 @@ margin-top: 10px #regenerate-key, -#remove-log +#remove-log-popup .cancel text-decoration: underline p @@ -85,6 +85,8 @@ margin-bottom: 5px a.button font-size: 13px + strong + color: $red #status-images, #regenerate-key input