Creating sweet user summary page

2014-02-14 03:48:03 -07:00
parent 17aa2b971c
commit 03a0588073
10 changed files with 106 additions and 85 deletions
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -17,10 +17,11 @@ class UsersController < ApplicationController
  def index
    unless params[:full] # by default, show summary

-      @users = @users.joins(:payments).where("payments.date > ?", (DateTime.now - 60.days)).uniq
+      @users = @users.paying + @users.volunteer
+#.joins(:payments).where("payments.date > ? OR ", (DateTime.now - 60.days)).uniq

      respond_to do |format|
-        format.html { render 'summary' }
+        format.html { render 'summary', layout: 'resources' }
        format.json { render :json => @users }
      end