---
src/app/controllers/deployments_controller.rb | 8 ++++----
src/app/views/deployments/_filter_view_show.haml | 5 +++++
src/app/views/deployments/_history.haml | 5 +++++
src/app/views/deployments/_pretty_view_show.haml | 5 +++++
src/app/views/deployments/_properties.haml | 7 ++++++-
5 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/app/controllers/deployments_controller.rb
b/src/app/controllers/deployments_controller.rb
index 9779084..84a68c2 100644
--- a/src/app/controllers/deployments_controller.rb
+++ b/src/app/controllers/deployments_controller.rb
@@ -96,10 +96,10 @@ class DeploymentsController < ApplicationController
@view = filter_view? ? 'filter_view_show' : 'pretty_view_show'
#TODO add links to real data for history, permissions, services
@tabs = [{:name => 'Instances', :view => @view, :id =>
'instances', :count => @deployment.instances.count},
- {:name => 'Services', :view => @view, :id =>
'services'},
- {:name => 'History', :view => 'history', :id =>
'history'},
- {:name => 'Properties', :view => 'properties', :id
=> 'properties'},
- {:name => 'Permissions', :view => 'permissions', :id
=> 'permissions'}
+ #{:name => 'Services', :view => @view, :id =>
'services'},
+ #{:name => 'History', :view => 'history', :id =>
'history'},
+ {:name => 'Properties', :view => 'properties', :id
=> 'properties'}
+ #{:name => 'Permissions', :view => 'permissions', :id
=> 'permissions'}
]
details_tab_name = params[:details_tab].blank? ? 'instances' :
params[:details_tab]
@details_tab = @tabs.find {|t| t[:id] == details_tab_name} ||
@tabs.first[:name].downcase
diff --git a/src/app/views/deployments/_filter_view_show.haml
b/src/app/views/deployments/_filter_view_show.haml
index 1aec6ab..9b36730 100644
--- a/src/app/views/deployments/_filter_view_show.haml
+++ b/src/app/views/deployments/_filter_view_show.haml
@@ -12,3 +12,8 @@
= instance.public_addresses
%td
= instance.state
+
+:javascript
+ Conductor.setupPrettyFilterURL(
+ '#{url_for(:action => :show, :details_tab => 'instances',
:view => 'filter' )}',
+ '#{url_for(:action => :show, :details_tab => 'instances',
:view => 'pretty' )}');
\ No newline at end of file
diff --git a/src/app/views/deployments/_history.haml
b/src/app/views/deployments/_history.haml
index 9f4a57e..322a818 100644
--- a/src/app/views/deployments/_history.haml
+++ b/src/app/views/deployments/_history.haml
@@ -1 +1,6 @@
%h3 List of deployment events
+
+:javascript
+ Conductor.setupPrettyFilterURL(
+ '#{url_for(:action => :show, :details_tab => 'history',
:view => 'filter' )}',
+ '#{url_for(:action => :show, :details_tab => 'history',
:view => 'pretty' )}');
\ No newline at end of file
diff --git a/src/app/views/deployments/_pretty_view_show.haml
b/src/app/views/deployments/_pretty_view_show.haml
index aacb80f..853c8b9 100644
--- a/src/app/views/deployments/_pretty_view_show.haml
+++ b/src/app/views/deployments/_pretty_view_show.haml
@@ -14,3 +14,8 @@
- if instance.instance_key
%li
= link_to("Download key", key_instance_path(instance))
+
+:javascript
+ Conductor.setupPrettyFilterURL(
+ '#{url_for(:action => :show, :details_tab => 'instances',
:view => 'filter' )}',
+ '#{url_for(:action => :show, :details_tab => 'instances',
:view => 'pretty' )}');
\ No newline at end of file
diff --git a/src/app/views/deployments/_properties.haml
b/src/app/views/deployments/_properties.haml
index 476b20a..0168eb7 100644
--- a/src/app/views/deployments/_properties.haml
+++ b/src/app/views/deployments/_properties.haml
@@ -7,4 +7,9 @@
-(a)deployment_properties.each do |key, value|
%tr
%td=key.to_s.capitalize
- %td=value
\ No newline at end of file
+ %td=value
+
+:javascript
+ Conductor.setupPrettyFilterURL(
+ '#{url_for(:action => :show, :details_tab => 'properties',
:view => 'filter' )}',
+ '#{url_for(:action => :show, :details_tab => 'properties',
:view => 'pretty' )}');
\ No newline at end of file
--
1.7.4.4