From cee113c3fca295e0960035719c3f9a79efe1d7a2 Mon Sep 17 00:00:00 2001
From: vinicim <vvieira17@gmail.com>
Date: Sun, 15 Sep 2013 19:04:55 -0300
Subject: [PATCH] configuration combobox of new repository is working

---
 .gitignore                                 |  2 ++
 app/controllers/repositories_controller.rb |  1 +
 app/views/repositories/_form.html.erb      |  4 ++--
 config/database.yml.sample                 | 10 +---------
 config/database.yml.sample~                | 28 ++++++++++++++++++++++++++++
 config/database.yml~                       | 53 ++++++++++++++++-------------------------------------
 6 files changed, 50 insertions(+), 48 deletions(-)
 create mode 100644 config/database.yml.sample~

diff --git a/.gitignore b/.gitignore
index dae924b..46a7bdf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,6 @@
 coverage
 
 database.yml
+database.yml~
+database.yml.sample
 kalibro_cucumber_helpers.yml
\ No newline at end of file
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 94b0f32..d605ded 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -18,6 +18,7 @@ class RepositoriesController < ApplicationController
   def new
      @project = Project.find(params[:project_id])
      @repository = Repository.new
+     
   end
 
   # GET /repositories/1/edit
diff --git a/app/views/repositories/_form.html.erb b/app/views/repositories/_form.html.erb
index fff06e1..3482483 100644
--- a/app/views/repositories/_form.html.erb
+++ b/app/views/repositories/_form.html.erb
@@ -30,8 +30,8 @@
   </div>
 
   <div class="field">
-    <%= f.label :configuration %><br>
-    <%= f.text_field :configuration_id %>
+    <% configuration_list = KalibroEntities::Entities::Configuration.all.map { |conf| [conf.name, conf.id] } %>
+    <%= f.select( :configuration_id, configuration_list ) %>
   </div>
   <div class="actions">
     <%= f.submit %>
diff --git a/config/database.yml.sample b/config/database.yml.sample
index 09cc85a..ec041ff 100644
--- a/config/database.yml.sample
+++ b/config/database.yml.sample
@@ -1,17 +1,9 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
 development:
   adapter: sqlite3
   database: db/development.sqlite3
   pool: 5
   timeout: 5000
 
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test: &test
   adapter: sqlite3
   database: db/test.sqlite3
@@ -25,4 +17,4 @@ production:
   timeout: 5000
 
 cucumber:
-  <<: *test
\ No newline at end of file
+  <<: *test
diff --git a/config/database.yml.sample~ b/config/database.yml.sample~
new file mode 100644
index 0000000..09cc85a
--- /dev/null
+++ b/config/database.yml.sample~
@@ -0,0 +1,28 @@
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test: &test
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000
+
+cucumber:
+  <<: *test
\ No newline at end of file
diff --git a/config/database.yml~ b/config/database.yml~
index fdc67e1..46c5f9a 100644
--- a/config/database.yml~
+++ b/config/database.yml~
@@ -1,41 +1,20 @@
- development:
-   adapter: sqlite3
-   database: db/development.sqlite3
-   pool: 5
-   timeout: 5000
+development:
+adapter: sqlite3
+database: db/development.sqlite3
+pool: 5
+timeout: 5000
 
-#development:
-#  adapter: postgresql
-#  host: localhost
-#  encoding: utf8
-#  database: mezuro
-#  username: mezuro
-#  password: mezuro
-
- test:
-   adapter: sqlite3
-   database: db/test.sqlite3
-   pool: 5
-   timeout: 5000
-
-# test:
-#   adapter: postgresql
-#   host: localhost
-#   encoding: utf8
-#   database: mezuro
-#   username: mezuro
-#   password: mezuro
+test: &test
+adapter: sqlite3
+database: db/test.sqlite3
+pool: 5
+timeout: 5000
 
 production:
-   adapter: sqlite3
-   database: db/production.sqlite3
-   pool: 5
-   timeout: 5000
+adapter: sqlite3
+database: db/production.sqlite3
+pool: 5
+timeout: 5000
 
-#production:
-#  adapter: postgresql
-#  host: localhost
-#  encoding: utf8
-#  database: mezuro
-#  username: mezuro
-#  password: mezuro
+cucumber:
+  <<: *test
--
libgit2 0.21.2