consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into tracking_user_verifications_and_others

Browse Source 
Conflicts:
	app/controllers/admin/stats_controller.rb
	db/dev_seeds.rb
This commit is contained in:
palomahnhp
2016-04-20 11:44:33 +02:00
parent b4ec077f16 63c24c15ce
commit bf5d253e12
134 changed files with 2193 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/admin/stats_controller.rb
View File

@@ -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