Merge branch 'live' of ssh://ephesus.xvm.mit.edu/org/selectricity/selectricity-live

[selectricity] / app / views / account / summary.rhtml

diff --git a/app/views/account/summary.rhtml b/app/views/account/summary.rhtml
index b53122ed5094a898d026132ff464132128163f3d..0ea9f241dcb729614205a6445581998fc1b3335a 100644 (file)
--- a/app/views/account/summary.rhtml
+++ b/app/views/account/summary.rhtml
@@ -21,12 +21,8 @@ Member since: <%=h @user.created_at.strftime("%x") %>
     <% @user.elections.select {|e| e.instance_of?(Election)}.each do |election| %>
     <tr>
          <td style="text-align: left;">
     <% @user.elections.select {|e| e.instance_of?(Election)}.each do |election| %>
     <tr>
          <td style="text-align: left;">

-           <% if election.active == 1 -%>

            <%= link_to "#{election.name}", :controller => 'election', 
                            :action => 'show', :id => election %>
            <%= link_to "#{election.name}", :controller => 'election', 
                            :action => 'show', :id => election %>

-               <% else -%>
-                 <%=h election.name %>
-               <% end -%>

          </td>
          <td style="text-align: left;"><%=h election.description %></td>
          <td style="text-align: left;">
          </td>
          <td style="text-align: left;"><%=h election.description %></td>
          <td style="text-align: left;">