Added mac logs, improved mac editing/viewing

2013-02-01 00:06:13 -07:00
parent 04764af983
commit f3498ddcac
14 changed files with 98 additions and 27 deletions
--- a/config/database.yml
+++ b/config/database.yml
@@ -22,4 +22,4 @@ production:
  adapter: sqlite3
  database: db/production.sqlite3
  pool: 5
-  timeout: 5000
+  timeout: 300000
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -28,8 +28,11 @@ Dooraccess::Application.routes.draw do
  match 'door_logs/auto_download' => 'door_logs#auto_download', :as => :auto_download

  match 'macs/scan' => 'macs#scan'
+  match 'macs/import' => 'macs#import'
  resources :macs

+  resources :mac_logs
+
  root :to => "home#index"

  # The priority is based upon order of creation: