From: John Dong Date: Wed, 29 Aug 2007 22:22:13 +0000 (-0400) Subject: Merge into jdong X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/500f98b7b7c16d3b75ee85ef1cd7bc9180f3a533?hp=8f23a174c70223831055e1498b50c3ba260858fe Merge into jdong --- diff --git a/app/views/election/edit_candidates.rhtml b/app/views/election/edit_candidates.rhtml index 756554d..dcd601a 100644 --- a/app/views/election/edit_candidates.rhtml +++ b/app/views/election/edit_candidates.rhtml @@ -4,7 +4,6 @@ <% unless @election.candidates.empty? %>

The following are valid options or candidates in this election:

-1;3A <% @election.candidates.each do |candidate| %> <% @current_candidate = candidate %> diff --git a/db/schema.rb b/db/schema.rb index 6c038de..590425d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -74,11 +74,10 @@ ActiveRecord::Schema.define() do create_table "voters", :force => true do |t| t.column "email", :string, :limit => 100 t.column "password", :string, :limit => 100 - t.column "contacted", :integer, :limit => 4, :default => 0, :null => false - t.column "election_id", :integer, :null => false + t.column "contacted", :integer, :limit => 4, :default => 0, :null => false + t.column "election_id", :integer, :null => false t.column "session_id", :string, :limit => 32 t.column "ipaddress", :string, :limit => 32 - t.column "type", :string, :limit => 100, :default => "", :null => false end add_index "voters", ["election_id"], :name => "fk_election_voter"