altered inflector to handle reserve correctly

MegaGameSociety · Jun 16, 2016 · de4c0ab · de4c0ab
1 parent 8b34654
commit de4c0ab
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/app/views/games/human_control.html.erb b/app/views/games/human_control.html.erb
@@ -54,7 +54,7 @@
         <% end %>
     </table>
     <%= link_to "Income Index" , incomes_path(),:class => "button-input" %>
-    <%= link_to "Add Bonus Reserves", new_reserf_path, :class => 'button-input' %>
+    <%= link_to "Add Bonus Reserves", new_reserve_path, :class => 'button-input' %>
     <%= link_to "Bonus Reserves Index", reserves_path, :class => "button-input" %>
   </section>
 

diff --git a/config/database.yml b/config/database.yml
@@ -8,8 +8,8 @@ default: &default
   adapter: postgresql
   pool: 5
   timeout: 5000
-  username: zstayman
-  password: 
+  username: root
+  password: root
 
 development:
   <<: *default

diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
@@ -14,3 +14,7 @@
 # ActiveSupport::Inflector.inflections(:en) do |inflect|
 #   inflect.acronym 'RESTful'
 # end
+
+ActiveSupport::Inflector.inflections do |inflect|
+  inflect.irregular 'reserve', 'reserves'
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -109,7 +109,6 @@
 
   create_table "team_roles", force: :cascade do |t|
     t.string   "role_name"
-    t.string   "role_color"
     t.string   "role_permissions",  default: [], array: true
     t.datetime "created_at"
     t.datetime "updated_at"