Merge jdong

[selectricity] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 49b0c48a0334cacd9e1f4c35038b7cbb176f3606..ccd9ad0990874b6b4bb92d6260caa52a891b9982 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -28,7 +28,7 @@ Rails::Initializer.run do |config|
 
   # Use the database for sessions instead of the file system
   # (create the session table with 'rake db:sessions:create')
 
   # Use the database for sessions instead of the file system
   # (create the session table with 'rake db:sessions:create')

-  # config.action_controller.session_store = :active_record_store
+  config.action_controller.session_store = :active_record_store

 
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper, 
 
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper, 


@@ -65,9 +65,12 @@ require 'uniq_token'
 require 'randarray'
 require 'gruff-0.2.8/lib/gruff'
 require 'sparklines'
 require 'randarray'
 require 'gruff-0.2.8/lib/gruff'
 require 'sparklines'

-

 require 'rubyvote'
 require 'rubyvote'

-ELECTION_TYPES = %w(ssd plurality approval condorcet borda)
+ELECTION_TYPES = {'ssd' => "Schulze Method",
+                  'plurality' => "Plurality",
+                  'approval' => "Approval",
+                  'condorcet' => "Condorcet",
+                  'borda' => "Borda Count"}

 
 class String
   # alternate capitalization method that does not lowercase the rest of
 
 class String
   # alternate capitalization method that does not lowercase the rest of