Merge pull request #5331 from roymckenzie/feature/admin-show-recent-weekly-users
Most recent new users show on Weekly User Stats admin page
This commit is contained in:
commit
e135301642
3 changed files with 4 additions and 3 deletions
|
|
@ -53,7 +53,8 @@ The keys will still be available in the root level within the 0.5 release. The o
|
|||
* Pull jquery.idle-timer.js from rails-assets.org [#5310](https://github.com/diaspora/diaspora/pull/5310)
|
||||
* Pull jquery.placeholder.js from rails-assets.org [#5299](https://github.com/diaspora/diaspora/pull/5299)
|
||||
* Pull jquery.textchange.js from rails-assets.org [#5297](https://github.com/diaspora/diaspora/pull/5297)
|
||||
* Reduce number of useless background job retries and pull public posts when missing [#5209](https://github.com/diaspora/diaspora/pull/5209)
|
||||
* Reduce number of useless background job retries and pull public posts when missing [#5209](https://github.com/diaspora/diaspora/pull/5209
|
||||
* Updated Weekly User Stats admin page to show data for the most recent week including reversing the order of the weeks in the drop down to show the most recent. [#5331](https://github.com/diaspora/diaspora/pull/5331)
|
||||
|
||||
## Bug fixes
|
||||
* orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158)
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ class AdminsController < Admin::AdminController
|
|||
@created_users_by_week[week] << u.username
|
||||
end
|
||||
|
||||
@selected_week = params[:week] || @created_users_by_week.keys.first
|
||||
@selected_week = params[:week] || @created_users_by_week.keys.last
|
||||
@counter = @created_users_by_week[@selected_week].count
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
%div.pull-right
|
||||
= form_tag('/admins/weekly_user_stats', method: 'get', class: 'form-inline') do
|
||||
= select_tag(:week, options_for_select(@created_users_by_week.keys), selected: @selected_week)
|
||||
= select_tag(:week, options_for_select(@created_users_by_week.keys.reverse), selected: @selected_week)
|
||||
= submit_tag t('admins.stats.go'), class: 'btn btn-primary'
|
||||
|
||||
= t('.amount_of', count: @counter)
|
||||
|
|
|
|||
Loading…
Reference in a new issue