merged fixes from devel

[selectricity-live] / app / views / quickvote / my_quickvotes.rhtml

diff --git a/app/views/quickvote/my_quickvotes.rhtml b/app/views/quickvote/my_quickvotes.rhtml
index 546cb24259c9faea131b312648c0bff8ece19dd2..bb388366be9d140706efc30c657054a3779c5355 100644 (file)
--- a/app/views/quickvote/my_quickvotes.rhtml
+++ b/app/views/quickvote/my_quickvotes.rhtml
@@ -7,13 +7,18 @@
 
   <% @myqvs.each do |quickvote| %>
   <tr>
-       <td>
-       <%= link_to "#{quickvote.name}",
-          quickaction_url( :ident => quickvote.name, :action => 'results' ) %>
+       <td>    
+         <% if quickvote.active == 1 %>
+           <%= link_to "#{quickvote.name}",
+                    quickaction_url( :ident => quickvote.name, 
+                                     :action => 'results' ) %>
+               <% else %>
+                 <%=h quickvote.name %>
+               <% end %>
        </td>
-    <td><%= quickvote.startdate.strftime("%x") %></td>
-    <td><%= quickvote.enddate.strftime("%x") %></td>
-       <td><%= quickvote.description %>
+    <td><%=h quickvote.startdate.strftime("%x") %></td>
+    <td><%=h quickvote.enddate.strftime("%x") %></td>
+       <td><%=h quickvote.description %></td>
   </tr>
 <% end %>
-</table>       
\ No newline at end of file
+</table>