From 1f3f0559bc1fde7a398f3126fde6fe7b8cf08ebb Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 26 Feb 2013 08:57:03 +0100 Subject: [PATCH] Fix build and job configs --- assets/scripts/app/models/build.coffee | 2 +- assets/scripts/app/models/job.coffee | 6 ++++-- assets/scripts/app/store/rest_adapter.coffee | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/assets/scripts/app/models/build.coffee b/assets/scripts/app/models/build.coffee index e383d51c..21518a05 100644 --- a/assets/scripts/app/models/build.coffee +++ b/assets/scripts/app/models/build.coffee @@ -10,7 +10,7 @@ require 'travis/model' branch: DS.attr('string') message: DS.attr('string') _duration: DS.attr('number') - _config: DS.attr('string') + _config: DS.attr('object') startedAt: DS.attr('string') finishedAt: DS.attr('string') diff --git a/assets/scripts/app/models/job.coffee b/assets/scripts/app/models/job.coffee index 3c32ad5b..e92f3329 100644 --- a/assets/scripts/app/models/job.coffee +++ b/assets/scripts/app/models/job.coffee @@ -24,6 +24,8 @@ require 'travis/model' # TODO: remove when this issue is fixed fakeBuild: DS.belongsTo('Travis.Build') + _config: DS.attr('object') + log: ( -> Travis.Log.create(job: this) ).property() @@ -37,8 +39,8 @@ require 'travis/model' ).property('repoSlug', 'repoId') config: (-> - Travis.Helpers.compact(@get('data.config')) - ).property('data.config') + Travis.Helpers.compact(@get('_config')) + ).property('_config') isFinished: (-> @get('state') in ['passed', 'failed', 'errored', 'canceled'] diff --git a/assets/scripts/app/store/rest_adapter.coffee b/assets/scripts/app/store/rest_adapter.coffee index 848c05e9..d8a402f4 100644 --- a/assets/scripts/app/store/rest_adapter.coffee +++ b/assets/scripts/app/store/rest_adapter.coffee @@ -119,6 +119,7 @@ Travis.RestAdapter.map 'Travis.Repo', { Travis.RestAdapter.map 'Travis.Job', { repoId: { key: 'repository_id' } repo: { key: 'repository_id' } + _config: { key: 'config' } } Travis.RestAdapter.map 'Travis.User', {