Usability tweaks, creating merges, fixing issues

2013-05-23 23:25:09 -07:00
parent 20a007cac5
commit 75e4907a9c
9 changed files with 244 additions and 4 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -18,6 +18,9 @@ Dooraccess::Application.routes.draw do
      end
  end

+  match 'user_summary/:id' => 'users#user_summary' # User summary view
+  match 'users/merge' => 'users#merge_view', :via => :get # Merge view
+  match 'users/merge' => 'users#merge_action', :via => :post # Merge action
  resources :users
  match 'users/create' => 'users#create', :via => :post  # Use POST users/create instead of POST users to avoid devise conflict