fixed about page

chrismatthieu · Aug 26, 2012 · cb292c6 · cb292c6
1 parent bf5f908
commit cb292c6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
@@ -22,7 +22,7 @@ def index
   def about
     if @current_user
       @users = User.order("username").where("officer = true and council_id = ?", @current_user.council_id)
-    else
+    elsif @council 
       @users = User.order("username").where("officer = true and council_id = ?", @council.id)
     end
 
@@ -35,7 +35,7 @@ def news
   end
 
   def contact
-    
+
     if @council and !@council.email.blank?
       @tomail = @council.email
     else

diff --git a/app/views/pages/about.html.erb b/app/views/pages/about.html.erb
@@ -9,6 +9,7 @@
 <p><%=@council.about%></p><br />
 <p><a class="btn btn-primary btn-large" href="/join">Join Us! &raquo;</a></p>
 
+<% if @users %>
 <a name="officers"></a>
 <h2>Council Officers</h2>
 <p>
@@ -46,6 +47,7 @@
 	</table>
 
 </p>
+<% end %>
 
 <h2>Contact Us</h2>