fix things after rebase

assets/scripts/app/models/build.coffee

@@ -30,7 +30,7 @@ require 'travis/model'
   ).property('data.job_ids.length')
 
   isFinished: (->
-    @get('state') == 'finished'
+    @get('state') in ['passed', 'failed', 'errored', 'canceled']
   ).property('state')
 
   requiredJobs: (->
@@ -60,15 +60,11 @@ require 'travis/model'
     Travis.ajax.post '/requests', build_id: @get('id')
 
   isAttributeLoaded: (key) ->
-    if ['_duration', 'finishedAt', 'state'].contains(key) && !@get('finished')
+    if ['_duration', 'finishedAt', 'state'].contains(key) && !@get('isFinished')
       return true
     else
       @_super(key)
 
-  finished: (->
-    @get('state') == 'finished'
-  ).property('state')
-
 
 @Travis.Build.reopenClass
   byRepoId: (id, parameters) ->

assets/scripts/app/models/job.coffee

@@ -32,7 +32,7 @@ require 'travis/model'
   ).property('data.config')
 
   isFinished: (->
-    @get('state') == 'finished'
+    @get('state') in ['passed', 'failed', 'errored', 'canceled']
   ).property('state')
 
   clearLog: ->
@@ -82,15 +82,15 @@ require 'travis/model'
   ).observes('state')
 
   isAttributeLoaded: (key) ->
-    if ['finishedAt', 'state'].contains(key) && !@get('finished')
+    if ['finishedAt', 'state'].contains(key) && !@get('isFinished')
       return true
     else if key == 'startedAt' && @get('state') == 'created'
       return true
     else
       @_super(key)
 
-  finished: (->
+  isFinished: (->
-    @get('state') == 'finished'
+    @get('state') in ['passed', 'failed', 'errored', 'canceled']
   ).property('state')
 
 @Travis.Job.reopenClass

assets/scripts/app/routes.coffee

@@ -22,7 +22,8 @@ lineNumberRoute = Ember.Route.extend
 
 Travis.Router = Ember.Router.extend
   location: 'travis'
-  enableLogging: true
+  # enableLogging: true
+  enableLogging: false
   initialState: 'loading'
 
   showRoot:         Ember.Route.transitionTo('root.home.show')

assets/scripts/app/views/job.coffee

@@ -104,10 +104,8 @@
     logSubscriber: (->
       # for some reason observing context does not work,
       # TODO: find out why
-      job   = @get('job')
+      job = @get('job')
-      state = @get('job.state')
+      job.subscribe() if job && !job.get('isFinished')
-      if job && state != 'finished'
-        job.subscribe()
       null
     ).property('job', 'job.state')
 

assets/scripts/app/views/repo/show.coffee

@@ -133,16 +133,16 @@
           Travis.app.router.flashController.loadFlashes([{ error: 'Travis encountered an error while trying to regenerate the key, please try again.'}])
 
     canRequeueBuild: (->
-      @get('isBuildTab') && @get('build.isFinished') && @get('hasPermissions')
+      @get('isBuildTab') && @get('build.isFinished') && @get('hasPermission')
     ).property('isBuildTab', 'build.isFinished', 'hasPermissions')
 
     canRequeueJob: (->
-      @get('isJobTab') && @get('job.isFinished') && @get('hasPermissions')
+      @get('isJobTab') && @get('job.isFinished') && @get('hasPermission')
     ).property('isJobTab', 'job.isFinished', 'hasPermissions')
 
     canCancelBuild: (->
       @get('isBuildTab') && @get('build.canCancel') && @get('hasPermission')
-    ).property('build.state', 'hasPushPermissions', 'tab')
+    ).property('build.state', 'hasPermission', 'tab')
 
     canRegenerateKey: (->
       @get('hasPermissions')
@@ -150,7 +150,8 @@
 
     canCancelJob: (->
       @get('isJobTab') && @get('job.canCancel') && @get('hasPermission')
-    ).property('job.state', 'hasPushPermissions', 'tab')
+    ).property('job.state', 'hasPermission', 'tab')
+
 
     isJobTab: (->
       @get('tab') == 'job'
@@ -165,6 +166,7 @@
         permissions.indexOf(@get('repo.id')) > -1
     ).property('Travis.app.currentUser.permissions.length', 'repo.id')
 
+
     branches: (->
       @get('repo.branches') if @get('active')
     ).property('active', 'repo.branches')