Rename user#list to user#index

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 644c62b6f99e324214c7cb62f00d76748e9cb49c..5aaa9d72b47a091a140e7a9160c4524016fd2d06 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -14,7 +14,7 @@ class UserController < ApplicationController
   before_action :require_allow_read_prefs, :only => [:api_details]
   before_action :require_allow_read_gpx, :only => [:api_gpx_files]
   before_action :require_cookies, :only => [:new, :login, :confirm]
   before_action :require_allow_read_prefs, :only => [:api_details]
   before_action :require_allow_read_gpx, :only => [:api_gpx_files]
   before_action :require_cookies, :only => [:new, :login, :confirm]

-  before_action :require_administrator, :only => [:set_status, :delete, :list]
+  before_action :require_administrator, :only => [:set_status, :delete, :index]

   around_action :api_call_handle_error, :only => [:api_read, :api_users, :api_details, :api_gpx_files]
   before_action :lookup_user_by_id, :only => [:api_read]
   before_action :lookup_user_by_name, :only => [:set_status, :delete]
   around_action :api_call_handle_error, :only => [:api_read, :api_users, :api_details, :api_gpx_files]
   before_action :lookup_user_by_id, :only => [:api_read]
   before_action :lookup_user_by_name, :only => [:set_status, :delete]


@@ -488,7 +488,7 @@ class UserController < ApplicationController
 
   ##
   # display a list of users matching specified criteria
 
   ##
   # display a list of users matching specified criteria

-  def list
+  def index

     if request.post?
       ids = params[:user].keys.collect(&:to_i)
 
     if request.post?
       ids = params[:user].keys.collect(&:to_i)
 

diff --git a/app/views/user/_user.html.erb b/app/views/user/_user.html.erb
index ad219655e949238348d6233642e9d5d3f0bf71dd..da9ae75c921b5b50c7c09df849e63649bb521252 100644 (file)
--- a/app/views/user/_user.html.erb
+++ b/app/views/user/_user.html.erb
@@ -7,13 +7,13 @@
   <td>
     <p>
       <% if user.creation_ip %>
   <td>
     <p>
       <% if user.creation_ip %>

-        <%= raw t 'user.list.summary',
+        <%= raw t 'user.index.summary',

             :name => link_to(h(user.display_name), user_path(user)),
             :ip_address => link_to(user.creation_ip, :ip => user.creation_ip),
             :date => l(user.creation_time, :format => :friendly)
         %>
       <% else %>
             :name => link_to(h(user.display_name), user_path(user)),
             :ip_address => link_to(user.creation_ip, :ip => user.creation_ip),
             :date => l(user.creation_time, :format => :friendly)
         %>
       <% else %>

-        <%= raw t 'user.list.summary_no_ip',
+        <%= raw t 'user.index.summary_no_ip',

             :name => link_to(h(user.display_name), user_path(user)),
             :date => l(user.creation_time, :format => :friendly)
         %>
             :name => link_to(h(user.display_name), user_path(user)),
             :date => l(user.creation_time, :format => :friendly)
         %>

diff --git a/app/views/user/list.html.erb b/app/views/user/index.html.erb
similarity index 100%
rename from app/views/user/list.html.erb
rename to app/views/user/index.html.erb

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7682204d5ea71c7bddc1b23a6621afe2e6d13d01..bebfedfde922c802d719b0250fe9c52bc51ea9d5 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2168,7 +2168,7 @@ en:
       not_a_friend: "%{name} is not one of your friends."
     filter:
       not_an_administrator: "You need to be an administrator to perform that action."
       not_a_friend: "%{name} is not one of your friends."
     filter:
       not_an_administrator: "You need to be an administrator to perform that action."

-    list:
+    index:

       title: Users
       heading: Users
       showing:
       title: Users
       heading: Users
       showing:

diff --git a/config/routes.rb b/config/routes.rb
index da7e0de71105a0e1195fae05019ecbd6a61a6a7d..35c46d8c1df9487914d698f8397105f5878ebdd0 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -242,8 +242,8 @@ OpenStreetMap::Application.routes.draw do
   get "/user/:display_name/delete" => "user#delete", :as => :delete_user
 
   # user lists
   get "/user/:display_name/delete" => "user#delete", :as => :delete_user
 
   # user lists

-  match "/users" => "user#list", :via => [:get, :post]
-  match "/users/:status" => "user#list", :via => [:get, :post]
+  match "/users" => "user#index", :via => [:get, :post]
+  match "/users/:status" => "user#index", :via => [:get, :post]

 
   # geocoder
   get "/search" => "geocoder#search"
 
   # geocoder
   get "/search" => "geocoder#search"

diff --git a/test/controllers/user_controller_test.rb b/test/controllers/user_controller_test.rb
index ba4b2ff3ac02a58c785843810d484f6d5e338b95..ba47094071f3b170399675696098d5e27f82c759 100644 (file)
--- a/test/controllers/user_controller_test.rb
+++ b/test/controllers/user_controller_test.rb
@@ -170,19 +170,19 @@ class UserControllerTest < ActionController::TestCase
 
     assert_routing(
       { :path => "/users", :method => :get },
 
     assert_routing(
       { :path => "/users", :method => :get },

-      { :controller => "user", :action => "list" }
+      { :controller => "user", :action => "index" }

     )
     assert_routing(
       { :path => "/users", :method => :post },
     )
     assert_routing(
       { :path => "/users", :method => :post },

-      { :controller => "user", :action => "list" }
+      { :controller => "user", :action => "index" }

     )
     assert_routing(
       { :path => "/users/status", :method => :get },
     )
     assert_routing(
       { :path => "/users/status", :method => :get },

-      { :controller => "user", :action => "list", :status => "status" }
+      { :controller => "user", :action => "index", :status => "status" }

     )
     assert_routing(
       { :path => "/users/status", :method => :post },
     )
     assert_routing(
       { :path => "/users/status", :method => :post },

-      { :controller => "user", :action => "list", :status => "status" }
+      { :controller => "user", :action => "index", :status => "status" }

     )
   end
 
     )
   end
 


@@ -1431,7 +1431,7 @@ class UserControllerTest < ActionController::TestCase
     assert_equal "deleted", user.status
   end
 
     assert_equal "deleted", user.status
   end
 

-  def test_list_get
+  def test_index_get

     user = create(:user)
     moderator_user = create(:moderator_user)
     administrator_user = create(:administrator_user)
     user = create(:user)
     moderator_user = create(:moderator_user)
     administrator_user = create(:administrator_user)


@@ -1443,21 +1443,21 @@ class UserControllerTest < ActionController::TestCase
     assert_equal 7, User.count
 
     # Shouldn't work when not logged in
     assert_equal 7, User.count
 
     # Shouldn't work when not logged in

-    get :list
+    get :index

     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path
 
     session[:user] = user.id
 
     # Shouldn't work when logged in as a normal user
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path
 
     session[:user] = user.id
 
     # Shouldn't work when logged in as a normal user

-    get :list
+    get :index

     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path
 
     session[:user] = moderator_user.id
 
     # Shouldn't work when logged in as a moderator
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path
 
     session[:user] = moderator_user.id
 
     # Shouldn't work when logged in as a moderator

-    get :list
+    get :index

     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path
 
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path
 


@@ -1465,25 +1465,25 @@ class UserControllerTest < ActionController::TestCase
 
     # Note there is a header row, so all row counts are users + 1
     # Should work when logged in as an administrator
 
     # Note there is a header row, so all row counts are users + 1
     # Should work when logged in as an administrator

-    get :list
+    get :index

     assert_response :success
     assert_response :success

-    assert_template :list
+    assert_template :index

     assert_select "table#user_list tr", :count => 7 + 1
 
     # Should be able to limit by status
     assert_select "table#user_list tr", :count => 7 + 1
 
     # Should be able to limit by status

-    get :list, :params => { :status => "suspended" }
+    get :index, :params => { :status => "suspended" }

     assert_response :success
     assert_response :success

-    assert_template :list
+    assert_template :index

     assert_select "table#user_list tr", :count => 1 + 1
 
     # Should be able to limit by IP address
     assert_select "table#user_list tr", :count => 1 + 1
 
     # Should be able to limit by IP address

-    get :list, :params => { :ip => "1.2.3.4" }
+    get :index, :params => { :ip => "1.2.3.4" }

     assert_response :success
     assert_response :success

-    assert_template :list
+    assert_template :index

     assert_select "table#user_list tr", :count => 1 + 1
   end
 
     assert_select "table#user_list tr", :count => 1 + 1
   end
 

-  def test_list_get_paginated
+  def test_index_get_paginated

     1.upto(100).each do |n|
       User.create(:display_name => "extra_#{n}",
                   :email => "extra#{n}@example.com",
     1.upto(100).each do |n|
       User.create(:display_name => "extra_#{n}",
                   :email => "extra#{n}@example.com",


@@ -1495,29 +1495,29 @@ class UserControllerTest < ActionController::TestCase
     # 100 examples, an administrator, and a granter for the admin.
     assert_equal 102, User.count
 
     # 100 examples, an administrator, and a granter for the admin.
     assert_equal 102, User.count
 

-    get :list
+    get :index

     assert_response :success
     assert_response :success

-    assert_template :list
+    assert_template :index

     assert_select "table#user_list tr", :count => 51
 
     assert_select "table#user_list tr", :count => 51
 

-    get :list, :params => { :page => 2 }
+    get :index, :params => { :page => 2 }

     assert_response :success
     assert_response :success

-    assert_template :list
+    assert_template :index

     assert_select "table#user_list tr", :count => 51
 
     assert_select "table#user_list tr", :count => 51
 

-    get :list, :params => { :page => 3 }
+    get :index, :params => { :page => 3 }

     assert_response :success
     assert_response :success

-    assert_template :list
+    assert_template :index

     assert_select "table#user_list tr", :count => 3
   end
 
     assert_select "table#user_list tr", :count => 3
   end
 

-  def test_list_post_confirm
+  def test_index_post_confirm

     inactive_user = create(:user, :pending)
     suspended_user = create(:user, :suspended)
 
     # Shouldn't work when not logged in
     assert_no_difference "User.active.count" do
     inactive_user = create(:user, :pending)
     suspended_user = create(:user, :suspended)
 
     # Shouldn't work when not logged in
     assert_no_difference "User.active.count" do

-      post :list, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
+      post :index, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }

     end
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path
     end
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path


@@ -1528,7 +1528,7 @@ class UserControllerTest < ActionController::TestCase
 
     # Shouldn't work when logged in as a normal user
     assert_no_difference "User.active.count" do
 
     # Shouldn't work when logged in as a normal user
     assert_no_difference "User.active.count" do

-      post :list, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
+      post :index, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }

     end
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path
     end
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path


@@ -1539,7 +1539,7 @@ class UserControllerTest < ActionController::TestCase
 
     # Shouldn't work when logged in as a moderator
     assert_no_difference "User.active.count" do
 
     # Shouldn't work when logged in as a moderator
     assert_no_difference "User.active.count" do

-      post :list, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
+      post :index, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }

     end
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path
     end
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path


@@ -1550,21 +1550,21 @@ class UserControllerTest < ActionController::TestCase
 
     # Should work when logged in as an administrator
     assert_difference "User.active.count", 2 do
 
     # Should work when logged in as an administrator
     assert_difference "User.active.count", 2 do

-      post :list, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
+      post :index, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }

     end
     assert_response :redirect
     end
     assert_response :redirect

-    assert_redirected_to :action => :list
+    assert_redirected_to :action => :index

     assert_equal "confirmed", inactive_user.reload.status
     assert_equal "confirmed", suspended_user.reload.status
   end
 
     assert_equal "confirmed", inactive_user.reload.status
     assert_equal "confirmed", suspended_user.reload.status
   end
 

-  def test_list_post_hide
+  def test_index_post_hide

     normal_user = create(:user)
     confirmed_user = create(:user, :confirmed)
 
     # Shouldn't work when not logged in
     assert_no_difference "User.active.count" do
     normal_user = create(:user)
     confirmed_user = create(:user, :confirmed)
 
     # Shouldn't work when not logged in
     assert_no_difference "User.active.count" do

-      post :list, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
+      post :index, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }

     end
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path
     end
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path


@@ -1575,7 +1575,7 @@ class UserControllerTest < ActionController::TestCase
 
     # Shouldn't work when logged in as a normal user
     assert_no_difference "User.active.count" do
 
     # Shouldn't work when logged in as a normal user
     assert_no_difference "User.active.count" do

-      post :list, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
+      post :index, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }

     end
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path
     end
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path


@@ -1586,7 +1586,7 @@ class UserControllerTest < ActionController::TestCase
 
     # Shouldn't work when logged in as a moderator
     assert_no_difference "User.active.count" do
 
     # Shouldn't work when logged in as a moderator
     assert_no_difference "User.active.count" do

-      post :list, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
+      post :index, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }

     end
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path
     end
     assert_response :redirect
     assert_redirected_to :action => :login, :referer => users_path


@@ -1597,10 +1597,10 @@ class UserControllerTest < ActionController::TestCase
 
     # Should work when logged in as an administrator
     assert_difference "User.active.count", -2 do
 
     # Should work when logged in as an administrator
     assert_difference "User.active.count", -2 do

-      post :list, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
+      post :index, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }

     end
     assert_response :redirect
     end
     assert_response :redirect

-    assert_redirected_to :action => :list
+    assert_redirected_to :action => :index

     assert_equal "deleted", normal_user.reload.status
     assert_equal "deleted", confirmed_user.reload.status
   end
     assert_equal "deleted", normal_user.reload.status
     assert_equal "deleted", confirmed_user.reload.status
   end