]> projects.mako.cc - selectricity-live/commitdiff
Renamed "elections" controller to "election."
author<mako@atdot.cc> <>
Wed, 16 Aug 2006 19:36:30 +0000 (15:36 -0400)
committer<mako@atdot.cc> <>
Wed, 16 Aug 2006 19:36:30 +0000 (15:36 -0400)
22 files changed:
app/controllers/election_controller.rb [moved from app/controllers/elections_controller.rb with 98% similarity]
app/helpers/election_helper.rb [new file with mode: 0644]
app/helpers/elections_helper.rb [deleted file]
app/views/election/_candidate_line.rhtml [moved from app/views/elections/_candidate_line.rhtml with 100% similarity]
app/views/election/_candidate_list.rhtml [moved from app/views/elections/_candidate_list.rhtml with 100% similarity]
app/views/election/_candidates_form.rhtml [moved from app/views/elections/_candidates_form.rhtml with 100% similarity]
app/views/election/_overview_form.rhtml [moved from app/views/elections/_overview_form.rhtml with 100% similarity]
app/views/election/_voter_list.rhtml [moved from app/views/elections/_voter_list.rhtml with 100% similarity]
app/views/election/_voters_form.rhtml [moved from app/views/elections/_voters_form.rhtml with 100% similarity]
app/views/election/_winner.rhtml [moved from app/views/elections/_winner.rhtml with 100% similarity]
app/views/election/_winner_details.rhtml [moved from app/views/elections/_winner_details.rhtml with 100% similarity]
app/views/election/detailed_results.rhtml [moved from app/views/elections/detailed_results.rhtml with 100% similarity]
app/views/election/edit.rhtml [moved from app/views/elections/edit.rhtml with 100% similarity]
app/views/election/edit_candidates.rhtml [moved from app/views/elections/edit_candidates.rhtml with 100% similarity]
app/views/election/edit_voters.rhtml [moved from app/views/elections/edit_voters.rhtml with 100% similarity]
app/views/election/list.rhtml [moved from app/views/elections/list.rhtml with 100% similarity]
app/views/election/new.rhtml [moved from app/views/elections/new.rhtml with 100% similarity]
app/views/election/new_candidates.rhtml [moved from app/views/elections/new_candidates.rhtml with 100% similarity]
app/views/election/new_voters.rhtml [moved from app/views/elections/new_voters.rhtml with 100% similarity]
app/views/election/show.rhtml [moved from app/views/elections/show.rhtml with 100% similarity]
app/views/layouts/election.rhtml [moved from app/views/layouts/elections.rhtml with 100% similarity]
test/functional/election_controller_test.rb [moved from test/functional/elections_controller_test.rb with 100% similarity]

similarity index 98%
rename from app/controllers/elections_controller.rb
rename to app/controllers/election_controller.rb
index 4cb72bc779d29fdf7deae3f6016fabfaf005144a..aaa3d9fe7f8924cddde4edd16c5e6c4178b488c4 100644 (file)
@@ -1,4 +1,4 @@
-class ElectionsController < ApplicationController
+class ElectionController < ApplicationController
   model :raw_voter_list, :voter, :vote, :candidate
 
   ## general methods for dealing with elections
   model :raw_voter_list, :voter, :vote, :candidate
 
   ## general methods for dealing with elections
@@ -127,7 +127,7 @@ class ElectionsController < ApplicationController
   def detailed_results
    
     self.results
   def detailed_results
    
     self.results
-    breakpoint
+
     @voter_list = []
     @vote_list = []
     @election.voters. each do |voter|
     @voter_list = []
     @vote_list = []
     @election.voters. each do |voter|
diff --git a/app/helpers/election_helper.rb b/app/helpers/election_helper.rb
new file mode 100644 (file)
index 0000000..d05eee6
--- /dev/null
@@ -0,0 +1,2 @@
+module ElectionHelper
+end
diff --git a/app/helpers/elections_helper.rb b/app/helpers/elections_helper.rb
deleted file mode 100644 (file)
index 09497b1..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-module ElectionsHelper
-end

Benjamin Mako Hill || Want to submit a patch?