You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by mf...@apache.org on 2012/12/13 12:46:14 UTC
[4/4] git commit: Core: Serialize :drivers collection in same way as
other collections
Core: Serialize :drivers collection in same way as other collections
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/4141ee0b
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/4141ee0b
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/4141ee0b
Branch: refs/heads/master
Commit: 4141ee0b110322dd38ad793f38391cd3e826ba6c
Parents: f7b3079
Author: Michal Fojtik <mf...@redhat.com>
Authored: Wed Dec 12 10:27:54 2012 +0100
Committer: Michal fojtik <mf...@redhat.com>
Committed: Thu Dec 13 12:45:52 2012 +0100
----------------------------------------------------------------------
server/lib/deltacloud/collections/drivers.rb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/4141ee0b/server/lib/deltacloud/collections/drivers.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/collections/drivers.rb b/server/lib/deltacloud/collections/drivers.rb
index 9753c36..8c51019 100644
--- a/server/lib/deltacloud/collections/drivers.rb
+++ b/server/lib/deltacloud/collections/drivers.rb
@@ -39,7 +39,7 @@ module Deltacloud::Collections
halt 404 unless @driver
respond_to do |format|
format.xml { haml :"drivers/show" }
- format.json { @driver.to_json }
+ format.json { { :driver => @driver.merge(:id => params[:id]) }.to_json }
format.html { haml :"drivers/show" }
end
end