From 41d6f19a6bed3b1a53f2fba12ca86ffbac1f8f5a Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 8 Jul 2020 18:43:30 +0200 Subject: [PATCH] Rename the notes#mine action to index --- app/abilities/ability.rb | 2 +- app/controllers/notes_controller.rb | 6 ++--- .../notes/{mine.html.erb => index.html.erb} | 4 ++-- app/views/users/show.html.erb | 4 ++-- config/locales/en.yml | 2 +- config/routes.rb | 2 +- test/abilities/abilities_test.rb | 2 +- test/controllers/notes_controller_test.rb | 22 +++++++++---------- 8 files changed, 22 insertions(+), 22 deletions(-) rename app/views/notes/{mine.html.erb => index.html.erb} (85%) diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb index e72b4e85b..d91b7a2e7 100644 --- a/app/abilities/ability.rb +++ b/app/abilities/ability.rb @@ -17,7 +17,7 @@ class Ability can [:index, :feed], Changeset can :index, ChangesetComment can [:index, :rss, :show, :comments], DiaryEntry - can [:mine], Note + can [:index], Note can [:index, :show], Redaction can [:index, :show, :data, :georss, :picture, :icon], Trace can [:terms, :login, :logout, :new, :create, :save, :confirm, :confirm_resend, :confirm_email, :lost_password, :reset_password, :show, :auth_success, :auth_failure], User diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb index 7c6b033ca..9f2fdb7e2 100644 --- a/app/controllers/notes_controller.rb +++ b/app/controllers/notes_controller.rb @@ -1,5 +1,5 @@ class NotesController < ApplicationController - layout "site", :only => [:mine] + layout "site" before_action :check_api_readable before_action :authorize_web @@ -11,11 +11,11 @@ class NotesController < ApplicationController ## # Display a list of notes by a specified user - def mine + def index if params[:display_name] if @user = User.active.find_by(:display_name => params[:display_name]) @params = params.permit(:display_name) - @title = t "notes.mine.title", :user => @user.display_name + @title = t ".title", :user => @user.display_name @page = (params[:page] || 1).to_i @page_size = 10 @notes = @user.notes diff --git a/app/views/notes/mine.html.erb b/app/views/notes/index.html.erb similarity index 85% rename from app/views/notes/mine.html.erb rename to app/views/notes/index.html.erb index 2f68ba5c6..50059625d 100644 --- a/app/views/notes/mine.html.erb +++ b/app/views/notes/index.html.erb @@ -1,6 +1,6 @@ <% content_for :heading do %> -

<%= t "notes.mine.heading", :user => @user.display_name %>

-

<%= t "notes.mine.subheading_html", :user => link_to(@user.display_name, user_path(@user)) %>

+

<%= t ".heading", :user => @user.display_name %>

+

<%= t ".subheading_html", :user => link_to(@user.display_name, user_path(@user)) %>

<% end %> <%= render :partial => "notes_paging_nav" %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 1332ab6e2..35ee7776b 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -11,7 +11,7 @@ <%= number_with_delimiter(current_user.changesets.size) %>
  • - <%= link_to t(".my notes"), :controller => "notes", :action => "mine" %> + <%= link_to t(".my notes"), user_notes_path(@user) %>
  • <%= link_to t(".my traces"), :controller => "traces", :action => "mine" %> @@ -53,7 +53,7 @@ <%= number_with_delimiter(@user.changesets.size) %>
  • - <%= link_to t(".notes"), :controller => "notes", :action => "mine" %> + <%= link_to t(".notes"), user_notes_path(@user) %>
  • <%= link_to t(".traces"), :controller => "traces", :action => "index", :display_name => @user.display_name %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 2f2145b24..f635642c7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2448,7 +2448,7 @@ en: next: "Next »" previous: "« Previous" notes: - mine: + index: title: "Notes submitted or commented on by %{user}" heading: "%{user}'s notes" subheading_html: "Notes submitted or commented on by %{user}" diff --git a/config/routes.rb b/config/routes.rb index a98a11430..41dc7cfc5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -117,7 +117,7 @@ OpenStreetMap::Application.routes.draw do get "/note/new" => "browse#new_note" get "/user/:display_name/history" => "changesets#index" get "/user/:display_name/history/feed" => "changesets#feed", :defaults => { :format => :atom } - get "/user/:display_name/notes" => "notes#mine", :as => :my_notes + get "/user/:display_name/notes" => "notes#index", :as => :user_notes get "/history/friends" => "changesets#index", :friends => true, :as => "friend_changesets", :defaults => { :format => :html } get "/history/nearby" => "changesets#index", :nearby => true, :as => "nearby_changesets", :defaults => { :format => :html } diff --git a/test/abilities/abilities_test.rb b/test/abilities/abilities_test.rb index 99154b4b7..c27f75833 100644 --- a/test/abilities/abilities_test.rb +++ b/test/abilities/abilities_test.rb @@ -29,7 +29,7 @@ class GuestAbilityTest < AbilityTest test "note permissions for a guest" do ability = Ability.new nil - [:mine].each do |action| + [:index].each do |action| assert ability.can?(action, Note), "should be able to #{action} Notes" end end diff --git a/test/controllers/notes_controller_test.rb b/test/controllers/notes_controller_test.rb index 6eda7d3a3..1450aced8 100644 --- a/test/controllers/notes_controller_test.rb +++ b/test/controllers/notes_controller_test.rb @@ -13,11 +13,11 @@ class NotesControllerTest < ActionDispatch::IntegrationTest def test_routes assert_routing( { :path => "/user/username/notes", :method => :get }, - { :controller => "notes", :action => "mine", :display_name => "username" } + { :controller => "notes", :action => "index", :display_name => "username" } ) end - def test_mine_success + def test_index_success first_user = create(:user) second_user = create(:user) moderator_user = create(:moderator_user) @@ -33,43 +33,43 @@ class NotesControllerTest < ActionDispatch::IntegrationTest end # Note that the table rows include a header row - get my_notes_path(:display_name => first_user.display_name) + get user_notes_path(:display_name => first_user.display_name) assert_response :success assert_select "table.note_list tr", :count => 2 - get my_notes_path(:display_name => second_user.display_name) + get user_notes_path(:display_name => second_user.display_name) assert_response :success assert_select "table.note_list tr", :count => 2 - get my_notes_path(:display_name => "non-existent") + get user_notes_path(:display_name => "non-existent") assert_response :not_found session_for(moderator_user) - get my_notes_path(:display_name => first_user.display_name) + get user_notes_path(:display_name => first_user.display_name) assert_response :success assert_select "table.note_list tr", :count => 2 - get my_notes_path(:display_name => second_user.display_name) + get user_notes_path(:display_name => second_user.display_name) assert_response :success assert_select "table.note_list tr", :count => 3 - get my_notes_path(:display_name => "non-existent") + get user_notes_path(:display_name => "non-existent") assert_response :not_found end - def test_mine_paged + def test_index_paged user = create(:user) create_list(:note, 50) do |note| create(:note_comment, :note => note, :author => user) end - get my_notes_path(:display_name => user.display_name) + get user_notes_path(:display_name => user.display_name) assert_response :success assert_select "table.note_list tr", :count => 11 - get my_notes_path(:display_name => user.display_name, :page => 2) + get user_notes_path(:display_name => user.display_name, :page => 2) assert_response :success assert_select "table.note_list tr", :count => 11 end -- 2.45.1