Merge pull request #4062 from stalker314314/fix-erb-lint-copyright

[rails.git] / app / controllers / notes_controller.rb

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 7c6b033ca5adf6c6a8a10215d9ca94a49b89f80a..440a620e8116806be582b4b996a88088cb53a1a7 100644 (file)
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -1,32 +1,51 @@
 class NotesController < ApplicationController
-  layout "site", :only => [:mine]
+  layout :map_layout
 
   before_action :check_api_readable
   before_action :authorize_web
+  before_action :require_oauth
 
   authorize_resource
 
   before_action :set_locale
-  around_action :api_call_handle_error, :api_call_timeout
+  around_action :web_timeout
 
   ##
   # 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
         @notes = @notes.visible unless current_user&.moderator?
         @notes = @notes.order("updated_at DESC, id").distinct.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author)
+
+        render :layout => "site"
       else
         @title = t "users.no_such_user.title"
         @not_found_user = params[:display_name]
 
-        render :template => "users/no_such_user", :status => :not_found
+        render :template => "users/no_such_user", :status => :not_found, :layout => "site"
       end
     end
   end
+
+  def show
+    @type = "note"
+
+    if current_user&.moderator?
+      @note = Note.find(params[:id])
+      @note_comments = @note.comments.unscope(:where => :visible)
+    else
+      @note = Note.visible.find(params[:id])
+      @note_comments = @note.comments
+    end
+  rescue ActiveRecord::RecordNotFound
+    render :template => "browse/not_found", :status => :not_found
+  end
+
+  def new; end
 end