From f4eda4e41ae80f0f2d789fa142be3b0b59d1f306 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Mon, 17 Sep 2012 11:41:55 +0200 Subject: [PATCH] fix worker name truncation --- assets/javascripts/app/models/worker.coffee | 13 ----------- .../app/templates/workers/list.hbs | 22 +++++++++++-------- assets/javascripts/app/views/sidebar.coffee | 17 +++++++++++++- assets/stylesheets/right/lists.sass | 8 ++++++- public/javascripts/application.js | 2 +- public/stylesheets/application.css | 21 +++++++++++++----- 6 files changed, 53 insertions(+), 30 deletions(-) diff --git a/assets/javascripts/app/models/worker.coffee b/assets/javascripts/app/models/worker.coffee index edfba126..c722d08a 100644 --- a/assets/javascripts/app/models/worker.coffee +++ b/assets/javascripts/app/models/worker.coffee @@ -14,19 +14,6 @@ require 'travis/model' @get('name').match(/\d+$/)[0] ).property('name') - display: (-> - name = @get('name') - state = @get('state') - payload = @get('payload') - if name - name = name.replace('travis-', '') - if state == 'working' && payload != undefined - repo = if payload.repository then $.truncate(payload.repository.slug, 18) else undefined - number = if payload.build and payload.build.number then ' #' + payload.build.number else '' - state = if repo then repo + number else state - name + ': ' + state - ).property('state', 'name', 'payload') - isWorking: (-> @get('state') == 'working' ).property('state') diff --git a/assets/javascripts/app/templates/workers/list.hbs b/assets/javascripts/app/templates/workers/list.hbs index 462e5615..0a359635 100644 --- a/assets/javascripts/app/templates/workers/list.hbs +++ b/assets/javascripts/app/templates/workers/list.hbs @@ -1,21 +1,25 @@

{{t workers}}