merged in changes from live version

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

diff --git a/app/views/account/summary.rhtml b/app/views/account/summary.rhtml
index e6d231f29fa1162fc3dfb0fed4be19cd67990ea9..5af431b628651dfca826bef74c10b210fd7e962d 100644 (file)
--- a/app/views/account/summary.rhtml
+++ b/app/views/account/summary.rhtml
@@ -14,8 +14,10 @@ Member since: <%=h @user.created_at.strftime("%x") %>
   <table class="voterbox" id="election">
     <tr>
          <% Election.content_columns.each do |column| -%>
-         <% next if column.name.eql?("viewable") || column.name.eql?("quickuser")\
-         || column.name.eql?("active") || column.name.eql?("anonymous") %>
+         <% dontPrint = ["viewable", "quickuser", "active", "anonymous", \
+                                         "early_results", "embed_custom_string", "embeddable", \
+                                         "notices"]%>
+         <% next if dontPrint.include?(column.name)%>
            <th><%= column.human_name %></th>
          <% end -%>
     </tr>
@@ -33,14 +35,15 @@ Member since: <%=h @user.created_at.strftime("%x") %>
          <td><%=h election.description %></td>
          <td><%=h election.startdate.strftime("%x") %></td>
       <td><%=h election.enddate.strftime("%x") %></td>
-      <td>
-         <% if election.notices == 0 -%>
-              No
-            <% else -%>
+      <td><%=h election.election_method %></td>   
+         <td>
+                 <% if election.authenticated? %>
               Yes
-            <% end -%>
-         </td>   
-         <td><%=h election.election_method %></td>
+             <% else -%>
+              No
+             <% end -%>
+         </td>
+         
     </tr>
     <% end -%>
   </table>