Merge pull request crowbar#234 from cloudedge/pull-req-master-97d4b4b…

…3e4a1c06236531463f23538e8d5e0a367 crowbar#234 Merged by devtool for cloudsleuth
zehicle · Oct 24, 2013 · 7a0c795 · 7a0c795
2 parents 1517d61 + b9a00b1
commit 7a0c795
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
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= text_field_tag :deployment, network.deployment.name
+    %dd= f.collection_select :deployment, 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
@@ -26,15 +26,14 @@
         %td= n.ranges.map{ |r| r.name }.join(', ')
     = form_for :network, :'data-remote' => true, :url => networks_path(), :html => { :method=>:post, :'data-type' => 'html',  :class => "formtastic" } do |f|
       %tr
-        %td= text_field_tag :name, t('default'), :size=>10
-        %td= text_field_tag :description, "", :size=>30
-        %td= text_field_tag :deployment, Deployment.first.name, :size=>15
-        -#%td= collection_tag :deployments, Deployment.all, :id, :name
-        %td= text_field_tag :vlan, "-1", :size=>6
-        %td= text_field_tag :v6prefix, "auto", :size=>20
-        %td= text_field_tag :bridge, "-1", :size=>6
-        %td= text_field_tag :team_mode, "-1", :size=>6
-        %td= text_field_tag :conduit, "10g1", :size=>6
+        %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= text_field_tag :vlan, "-1", :size=>4
+        %td= text_field_tag :v6prefix, "auto", :size=>4
+        %td= text_field_tag :bridge, "-1", :size=>4
+        %td= text_field_tag :team_mode, "-1", :size=>4
+        %td= text_field_tag :conduit, "10g1", :size=>4
         %td
           %input.button{:type => "submit", :value => t('.add')}