Download as
Browse Code »

Commit c51270d7eec924fcbffd3682618dabe109480e4b

Authored by Rodrigo Souto
1 parent f8b1f66d
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

users-controller: default filter to all_users 

(ActionItem2995)
Showing 2 changed files with 6 additions and 1 deletions   Show diff stats
app/controllers/admin/users_controller.rb
  Diff comments   View file @c51270d
@@ -7,7 +7,7 @@ class UsersController < AdminController @@ -7,7 +7,7 @@ class UsersController < AdminController
7 include UsersHelper 7 include UsersHelper
8 8
9 def index 9 def index
10 - @filter = params[:filter] 10 + @filter = params[:filter] || 'all_users'
11 scope = environment.people.no_templates 11 scope = environment.people.no_templates
12 if @filter == 'admin_users' 12 if @filter == 'admin_users'
13 scope = scope.admins 13 scope = scope.admins
test/functional/users_controller_test.rb
  Diff comments   View file @c51270d
@@ -117,6 +117,11 @@ class UsersControllerTest < ActionController::TestCase @@ -117,6 +117,11 @@ class UsersControllerTest < ActionController::TestCase
117 assert_order ['ana', 'bill', 'creed', 'jeremy'], assigns(:collection).map(&:name) 117 assert_order ['ana', 'bill', 'creed', 'jeremy'], assigns(:collection).map(&:name)
118 end 118 end
119 119
  120 + should 'set filter to all_users by default' do
  121 + get :index
  122 + assert_equal 'all_users', assigns(:filter)
  123 + end
  124 +
120 should 'response as XML to export users' do 125 should 'response as XML to export users' do
121 get :download, :format => 'xml' 126 get :download, :format => 'xml'
122 assert_equal 'text/xml', @response.content_type 127 assert_equal 'text/xml', @response.content_type