Merge branch 'master' into tracking_user_verifications_and_others

Conflicts:
	app/controllers/admin/stats_controller.rb
	db/dev_seeds.rb

app/controllers/admin/api/stats_controller.rb

@@ -1,7 +1,9 @@
 class Admin::Api::StatsController < Admin::Api::BaseController
 
   def show
-    unless params[:events].present? || params[:visits].present?
+    unless params[:events].present? || 
+           params[:visits].present? || 
+           params[:spending_proposals].present?
       return render json: {}, status: :bad_request
     end
 
@@ -18,7 +20,10 @@ class Admin::Api::StatsController < Admin::Api::BaseController
       ds.add "Visits", Visit.group_by_day(:started_at).count
     end
 
+    if params[:spending_proposals].present?
+      ds.add "Spending proposals", SpendingProposal.group_by_day(:created_at).count
+    end
+
     render json: ds.build
   end
-
 end

app/controllers/admin/spending_proposals_controller.rb

@@ -7,7 +7,7 @@ class Admin::SpendingProposalsController < Admin::BaseController
   load_and_authorize_resource
 
   def index
-    @spending_proposals = SpendingProposal.search(params, @current_filter).order(created_at: :desc).page(params[:page])
+    @spending_proposals = SpendingProposal.scoped_filter(params, @current_filter).order(created_at: :desc).page(params[:page])
   end
 
   def show
@@ -21,10 +21,8 @@ class Admin::SpendingProposalsController < Admin::BaseController
 
   def update
     if @spending_proposal.update(spending_proposal_params)
-      path = admin_spending_proposal_path( @spending_proposal,
-        { anchor: 'classification' }.merge(SpendingProposal.filter_params(params)))
-
-      redirect_to path, notice: t("flash.actions.update.spending_proposal")
+      redirect_to admin_spending_proposal_path(@spending_proposal, SpendingProposal.filter_params(params)),
+                  notice: t("flash.actions.update.spending_proposal")
     else
       render :edit
     end
@@ -33,7 +31,7 @@ class Admin::SpendingProposalsController < Admin::BaseController
   private
 
     def spending_proposal_params
-      params.require(:spending_proposal).permit(:administrator_id, :tag_list, valuator_ids: [])
+      params.require(:spending_proposal).permit(:title, :description, :external_url, :geozone_id, :association_name, :administrator_id, :tag_list, valuator_ids: [])
     end
 
 end

app/controllers/admin/stats_controller.rb

@@ -18,10 +18,10 @@ class Admin::StatsController < Admin::BaseController
     @verified_users = User.with_hidden.level_two_or_three_verified.count
     @unverified_users = User.with_hidden.unverified.count
     @users = User.with_hidden.count
-
-    @user_ids_who_voted_proposals = 
-     ActsAsVotable::Vote.where(votable_type: 'Proposal').pluck(:voter_id).uniq.count 
+    @user_ids_who_voted_proposals =
+     ActsAsVotable::Vote.where(votable_type: 'Proposal').pluck(:voter_id).uniq.count
     @user_ids_who_didnt_vote_proposals = @verified_users - @user_ids_who_voted_proposals
-  end
+    @spending_proposals = SpendingProposal.count
 
+  end
 end