Merge pull request crowbar#236 from cloudedge/pull-req-master-5f3c50a…

…b2fc42f0da1fcaf118c1e43973344fd32 Fix Deployment Pulldown [1/1]
zehicle · Nov 2, 2013 · 2c0dda8 · 2c0dda8
2 parents 499525a + 11bad0e
commit 2c0dda8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/crowbar_engine/barclamp_network/app/controllers/barclamp_network/networks_controller.rb b/crowbar_engine/barclamp_network/app/controllers/barclamp_network/networks_controller.rb
@@ -106,6 +106,8 @@ def update
       @network.vlan = vl
       @network.use_vlan = (vl>0) unless params.has_key?(:use_vlan)
     end
+    params[:deployment_id] = Deployment.find_key params[:deployment] if params.has_key?(:deployment)
+    @network.deployment_id = params[:deployment_id] if params.has_key?(:deployment_id)
     @network.conduit = params[:conduit] if params.has_key?(:conduit)
     @network.description = params[:description] if params.has_key?(:description)
     @network.order = params[:order] if params.has_key?(:order)

diff --git a/crowbar_engine/barclamp_network/app/views/barclamp_network/networks/_show.html.haml b/crowbar_engine/barclamp_network/app/views/barclamp_network/networks/_show.html.haml
@@ -5,7 +5,7 @@
     %dt= t 'description', :scope=>'barclamp_network.networks.show'
     %dd= text_field_tag :description, network.description, :size=>30
     %dt= t 'deployment', :scope=>'barclamp_network.networks.show'
-    %dd= f.collection_select :deployment, Deployment.all, :id, :name, :selected=>network.deployment.id
+    %dd= select_tag :deployment_id, options_from_collection_for_select(Deployment.all, :id, :name, :selected=>network.deployment.id)
     %dt= t 'conduit', :scope=>'barclamp_network.networks.show'
     %dd= text_field_tag :conduit, network.conduit, :size=>15
     %dt= t 'vlan', :scope=>'barclamp_network.networks.show'

diff --git a/crowbar_engine/barclamp_network/app/views/barclamp_network/networks/index.html.haml b/crowbar_engine/barclamp_network/app/views/barclamp_network/networks/index.html.haml
@@ -28,7 +28,7 @@
       %tr
         %td= text_field_tag :name, t('default'), :size=>6
         %td= text_field_tag :description, "", :size=>20
-        %td= f.collection_select :deployment, Deployment.all, :id, :name
+        %td= select_tag :deployment_id, options_from_collection_for_select(Deployment.all, :id, :name)
         %td= text_field_tag :vlan, "-1", :size=>4
         %td= text_field_tag :v6prefix, "auto", :size=>4
         %td= text_field_tag :bridge, "-1", :size=>4