From 5a06a3dffe1342686f547663610bbe72f216fcd5 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 5 Sep 2018 14:52:36 +0800 Subject: [PATCH 1/1] Rename diary_entry#view to diary_entry#show --- app/controllers/diary_entry_controller.rb | 24 ++++----- app/helpers/issues_helper.rb | 4 +- app/models/notifier.rb | 12 +---- app/views/diary_entry/_diary_entry.html.erb | 6 +-- app/views/diary_entry/comments.html.erb | 2 +- app/views/diary_entry/rss.rss.builder | 6 +-- .../{view.html.erb => show.html.erb} | 0 config/locales/en.yml | 2 +- config/routes.rb | 2 +- .../diary_entry_controller_test.rb | 54 +++++++++---------- 10 files changed, 52 insertions(+), 60 deletions(-) rename app/views/diary_entry/{view.html.erb => show.html.erb} (100%) diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb index f2c11fc74..f6da8d870 100644 --- a/app/controllers/diary_entry_controller.rb +++ b/app/controllers/diary_entry_controller.rb @@ -4,11 +4,11 @@ class DiaryEntryController < ApplicationController before_action :authorize_web before_action :set_locale before_action :require_user, :only => [:new, :edit, :comment, :hide, :hidecomment, :subscribe, :unsubscribe] - before_action :lookup_user, :only => [:view, :comments] + before_action :lookup_user, :only => [:show, :comments] before_action :check_database_readable before_action :check_database_writable, :only => [:new, :edit, :comment, :hide, :hidecomment, :subscribe, :unsubscribe] before_action :require_administrator, :only => [:hide, :hidecomment] - before_action :allow_thirdparty_images, :only => [:new, :edit, :list, :view, :comments] + before_action :allow_thirdparty_images, :only => [:new, :edit, :list, :show, :comments] def new @title = t "diary_entry.new.title" @@ -47,9 +47,9 @@ class DiaryEntryController < ApplicationController @diary_entry = DiaryEntry.find(params[:id]) if current_user != @diary_entry.user - redirect_to :action => "view", :id => params[:id] + redirect_to diary_entry_path(@diary_entry.user, @diary_entry) elsif params[:diary_entry] && @diary_entry.update(entry_params) - redirect_to :action => "view", :id => params[:id] + redirect_to diary_entry_path(@diary_entry.user, @diary_entry) end set_map_location @@ -71,9 +71,9 @@ class DiaryEntryController < ApplicationController # Add the commenter to the subscribers if necessary @entry.subscriptions.create(:user => current_user) unless @entry.subscribers.exists?(current_user.id) - redirect_to :action => "view", :display_name => @entry.user.display_name, :id => @entry.id + redirect_to diary_entry_path(@entry.user, @entry) else - render :action => "view" + render :action => "show" end rescue ActiveRecord::RecordNotFound render :action => "no_such_entry", :status => :not_found @@ -84,7 +84,7 @@ class DiaryEntryController < ApplicationController diary_entry.subscriptions.create(:user => current_user) unless diary_entry.subscribers.exists?(current_user.id) - redirect_to :action => "view", :display_name => diary_entry.user.display_name, :id => diary_entry.id + redirect_to diary_entry_path(diary_entry.user, diary_entry) rescue ActiveRecord::RecordNotFound render :action => "no_such_entry", :status => :not_found end @@ -94,7 +94,7 @@ class DiaryEntryController < ApplicationController diary_entry.subscriptions.where(:user => current_user).delete_all if diary_entry.subscribers.exists?(current_user.id) - redirect_to :action => "view", :display_name => diary_entry.user.display_name, :id => diary_entry.id + redirect_to diary_entry_path(diary_entry.user, diary_entry) rescue ActiveRecord::RecordNotFound render :action => "no_such_entry", :status => :not_found end @@ -180,10 +180,10 @@ class DiaryEntryController < ApplicationController @entries = @entries.visible.includes(:user).order("created_at DESC").limit(20) end - def view + def show @entry = @user.diary_entries.visible.where(:id => params[:id]).first if @entry - @title = t "diary_entry.view.title", :user => params[:display_name], :title => @entry.title + @title = t "diary_entry.show.title", :user => params[:display_name], :title => @entry.title else @title = t "diary_entry.no_such_entry.title", :id => params[:id] render :action => "no_such_entry", :status => :not_found @@ -199,7 +199,7 @@ class DiaryEntryController < ApplicationController def hidecomment comment = DiaryComment.find(params[:comment]) comment.update(:visible => false) - redirect_to :action => "view", :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id + redirect_to diary_entry_path(comment.diary_entry.user, comment.diary_entry) end def comments @@ -235,7 +235,7 @@ class DiaryEntryController < ApplicationController def require_administrator unless current_user.administrator? flash[:error] = t("user.filter.not_an_administrator") - redirect_to :action => "view" + redirect_to :action => "show" end end diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index f9a84ba7d..474249648 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -2,11 +2,11 @@ module IssuesHelper def reportable_url(reportable) case reportable when DiaryEntry - url_for(:controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.user.display_name, :id => reportable.id) + diary_entry_url(reportable.user, reportable) when User url_for(:controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.display_name) when DiaryComment - url_for(:controller => reportable.diary_entry.class.name.underscore, :action => :view, :display_name => reportable.diary_entry.user.display_name, :id => reportable.diary_entry.id, :anchor => "comment#{reportable.id}") + diary_entry_url(reportable.diary_entry.user, reportable.diary_entry, :anchor => "comment#{reportable.id}") when Note url_for(:controller => :browse, :action => :note, :id => reportable.id) end diff --git a/app/models/notifier.rb b/app/models/notifier.rb index d08bedd8c..3008b7fa4 100644 --- a/app/models/notifier.rb +++ b/app/models/notifier.rb @@ -87,16 +87,8 @@ class Notifier < ActionMailer::Base @from_user = comment.user.display_name @text = comment.body @title = comment.diary_entry.title - @readurl = url_for(:controller => "diary_entry", - :action => "view", - :display_name => comment.diary_entry.user.display_name, - :id => comment.diary_entry.id, - :anchor => "comment#{comment.id}") - @commenturl = url_for(:controller => "diary_entry", - :action => "view", - :display_name => comment.diary_entry.user.display_name, - :id => comment.diary_entry.id, - :anchor => "newcomment") + @readurl = diary_entry_url(comment.diary_entry.user, comment.diary_entry, :anchor => "comment#{comment.id}") + @commenturl = diary_entry_url(comment.diary_entry.user, comment.diary_entry, :anchor => "newcomment") @replyurl = new_message_url(comment.user, :message => { :title => "Re: #{comment.diary_entry.title}" }) @author = @from_user diff --git a/app/views/diary_entry/_diary_entry.html.erb b/app/views/diary_entry/_diary_entry.html.erb index 930f20e5e..de62e8e1a 100644 --- a/app/views/diary_entry/_diary_entry.html.erb +++ b/app/views/diary_entry/_diary_entry.html.erb @@ -4,7 +4,7 @@ <%= user_thumbnail diary_entry.user %> <% end %> -

<%= link_to h(diary_entry.title), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id %>

+

<%= link_to h(diary_entry.title), diary_entry_path(diary_entry.user, diary_entry) %>

<%= raw(t '.posted_by', :link_user => (link_to h(diary_entry.user.display_name), user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entry', :action => 'list', :display_name => nil, :language => diary_entry.language_code)) %> @@ -22,9 +22,9 @@