merge everything back from mainline branch

[selectricity-live] / app / views / voter / _vote_sidebar.rhtml

diff --git a/app/views/voter/_vote_sidebar.rhtml b/app/views/voter/_vote_sidebar.rhtml
index 5b8d038178fe9d93c9aa39f92d4bee65e64843e4..2f250e077e536b65c6f7dbdc25ee1554f6cee276 100644 (file)
--- a/app/views/voter/_vote_sidebar.rhtml
+++ b/app/views/voter/_vote_sidebar.rhtml
@@ -6,5 +6,5 @@ order.</p>
 <%= render :partial => 'common/sortable_vote' %>
 
 <div style="margin-left: 30pt;">
-<%= button_to "Submit Vote", :action => 'review', :id => @voter.password %>
+<%= button_to "Submit Vote", :action => 'review', :id => @password %>
 </div>