projects
/
selectricity
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merged in from code from the other master
[selectricity]
/
app
/
views
/
election
/
show.rhtml
diff --git
a/app/views/election/show.rhtml
b/app/views/election/show.rhtml
index 2f628958434ab99c798dc75a8a0de69590c74ab5..39621bfbf329b1457a2752b7aa0dd7348be41177 100644
(file)
--- a/
app/views/election/show.rhtml
+++ b/
app/views/election/show.rhtml
@@
-8,13
+8,13
@@
:election_id => @election.id %>.</div>
<% elsif (@election.active? && @election.early_results? ) %>
:election_id => @election.id %>.</div>
<% elsif (@election.active? && @election.early_results? ) %>
- <div id="status">
The creator of this election has
decided that the results
+ <div id="status">
You have
decided that the results
should be viewable while the election is in progress.
should be viewable while the election is in progress.
- <%if @election.voters.empty? %>
+ <%if @election.voters.
select {|v| v.vote.confirmed?}.
empty? %>
However, no one has voted yet.
<% else %>
However, no one has voted yet.
<% else %>
- <%= link_to "View results", :controller => '
voter
', :action => 'results',
- :id =>
"open"
%>.
+ <%= link_to "View results", :controller => '
election
', :action => 'results',
+ :id =>
@election.id
%>.
<% end %>
</div>
<% elsif @election.active? %>
<% end %>
</div>
<% elsif @election.active? %>
Benjamin Mako Hill
||
Want to submit a patch?