aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoachim Filip Ignacy Bartosik <jbartosik@gmail.com>2011-07-26 16:15:36 +0200
committerJoachim Filip Ignacy Bartosik <jbartosik@gmail.com>2011-07-26 16:15:36 +0200
commit7b3f49a25aecef13a7b20ba7014c7432318bbd26 (patch)
treed0d4300dc9272f76eb25107ffc11170634e5eb9b
parentImprove tests (diff)
downloadcouncil-webapp-7b3f49a25aecef13a7b20ba7014c7432318bbd26.tar.gz
council-webapp-7b3f49a25aecef13a7b20ba7014c7432318bbd26.tar.bz2
council-webapp-7b3f49a25aecef13a7b20ba7014c7432318bbd26.zip
Improve controller readability
-rw-r--r--site/app/controllers/agendas_controller.rb2
-rw-r--r--site/app/controllers/voting_options_controller.rb8
2 files changed, 5 insertions, 5 deletions
diff --git a/site/app/controllers/agendas_controller.rb b/site/app/controllers/agendas_controller.rb
index 669f364..f94d96c 100644
--- a/site/app/controllers/agendas_controller.rb
+++ b/site/app/controllers/agendas_controller.rb
@@ -14,7 +14,7 @@ class AgendasController < ApplicationController
end
def results
- data = JSON.parse(request.env["rack.input"].read)
+ data = JSON.parse(request.env['rack.input'].read)
Agenda.update_voting_options data['agenda']
Agenda.process_results data data['votes']
agenda = Agenda.current
diff --git a/site/app/controllers/voting_options_controller.rb b/site/app/controllers/voting_options_controller.rb
index 14ec89f..73a0dfb 100644
--- a/site/app/controllers/voting_options_controller.rb
+++ b/site/app/controllers/voting_options_controller.rb
@@ -6,7 +6,10 @@ class VotingOptionsController < ApplicationController
def community_vote
option = VotingOption.find(params[:id])
- unless option.nil?
+ if option.nil?
+ flash[:notice] = "No such voting option"
+ redirect_to :controller => :agendas, :action => :index
+ else
if current_user.signed_up?
Vote.vote_for_option(current_user, option, false)
flash[:notice] = "You voted for #{option.description}"
@@ -14,9 +17,6 @@ class VotingOptionsController < ApplicationController
flash[:notice] = "You must be logged in to vote"
end
redirect_to :controller => :agenda_items, :action => :show, :id => option.agenda_item_id
- else
- flash[:notice] = "No such voting option"
- redirect_to :controller => :agendas, :action => :index
end
end
end