From 203302bd63bd747133ed4d2015a14bd402afeab3 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Tue, 24 Feb 2015 13:51:51 +0100
Subject: [PATCH] Fix remove log button popup

---
 app/templates/jobs/pre.hbs    | 2 +-
 app/views/pre.coffee          | 8 ++++----
 app/views/repo-actions.coffee | 6 ------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/app/templates/jobs/pre.hbs b/app/templates/jobs/pre.hbs
index 2435ddce..bda35c8e 100644
--- a/app/templates/jobs/pre.hbs
+++ b/app/templates/jobs/pre.hbs
@@ -1,7 +1,7 @@
 <section id="log-container" class="log">
   <menu class="log-header">
     {{#if view.canRemoveLog}}
-      <button class="button button--grey" {{action "removeLogPopup" target=view}}><span class="icon icon--removeLog"></span> Remove Log</button>
+      <button class="button button--grey open-popup" {{action "removeLogPopup" target=view}}><span class="icon icon--removeLog"></span> Remove Log</button>
     {{/if}}
     <a class="button button--grey" {{bind-attr href="view.plainTextLogUrl"}}><span class="icon icon--downloadLog"></span> Download Log</a>
   </menu>
diff --git a/app/views/pre.coffee b/app/views/pre.coffee
index de867224..222ba7f5 100644
--- a/app/views/pre.coffee
+++ b/app/views/pre.coffee
@@ -135,10 +135,10 @@ View = BasicView.extend
             Travis.flash(error: 'An error occured when removing the log')
 
     removeLogPopup: ->
-      # if @get('canRemoveLog')
-      @set('active', true)
-      @popup('remove-log-popup')
-      return false
+      if @get('canRemoveLog')
+        @set('active', true)
+        @popup('remove-log-popup')
+        return false
 
   noop: -> # TODO required?
 
diff --git a/app/views/repo-actions.coffee b/app/views/repo-actions.coffee
index ff8fece9..f40f5942 100644
--- a/app/views/repo-actions.coffee
+++ b/app/views/repo-actions.coffee
@@ -68,12 +68,6 @@ View = BasicView.extend
       @popup('code-climate')
       return false
 
-    removeLogPopup: ->
-      if @get('canRemoveLog')
-        @set('active', true)
-        @popup('remove-log-popup')
-        return false
-
   hasPermission: (->
     if permissions = @get('currentUser.permissions')
       permissions.contains parseInt(@get('repo.id'))