diff --git a/app/models/job.coffee b/app/models/job.coffee index fac0cb7a..ca252075 100644 --- a/app/models/job.coffee +++ b/app/models/job.coffee @@ -5,7 +5,6 @@ `import Model from 'travis/models/model'` `import Log from 'travis/models/log'` `import DurationCalculations from 'travis/utils/duration-calculations'` -`import languageConfigKeys from 'travis/utils/keys-map';` Job = Model.extend DurationCalculations, logId: DS.attr() diff --git a/app/templates/jobs.hbs b/app/templates/jobs.hbs index c765847b..e1fa6067 100644 --- a/app/templates/jobs.hbs +++ b/app/templates/jobs.hbs @@ -20,7 +20,7 @@

{{config.global_env}} {{config.env}}

-

{{config.language}}

+

{{view.languages}}

diff --git a/app/utils/keys-map.coffee b/app/utils/keys-map.coffee index 88f06268..2642d092 100644 --- a/app/utils/keys-map.coffee +++ b/app/utils/keys-map.coffee @@ -12,18 +12,18 @@ languageConfigKeys = { mono: 'Mono' dart: 'Dart' elixir: 'Elixir' + ghc: 'GHC' + jdk: 'JDK' + rvm: 'Ruby' + otp_release: 'OTP Release' } configKeys = { env: 'ENV' - rvm: 'Ruby' gemfile: 'Gemfile' - jdk: 'JDK' - otp_release: 'OTP Release' xcode_sdk: 'Xcode SDK' xcode_scheme:'Xcode Scheme' compiler: 'Compiler' - ghc: 'GHC' os: 'OS' } diff --git a/app/views/jobs-item.coffee b/app/views/jobs-item.coffee index 57909c5d..7a3b06a1 100644 --- a/app/views/jobs-item.coffee +++ b/app/views/jobs-item.coffee @@ -1,5 +1,6 @@ `import BasicView from 'travis/views/basic'` `import { colorForState } from 'travis/utils/helpers'` +`import { languageConfigKeys } from 'travis/utils/keys-map';` View = BasicView.extend tagName: 'div' @@ -11,4 +12,14 @@ View = BasicView.extend colorForState(@get('job.state')) ).property('job.state') + languages: (-> + output = [] + config = @get('job.config') + for key, languageName of languageConfigKeys + if version = config[key] + output.push(languageName + ' ' + version) + + output.join(' ') + ).property() + `export default View`