Merge remote-tracking branch 'upstream/pull/5391'

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

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 7d6163f4886b08ae97c7e5716c706ca69df71703..c40e776b444074efc192c9e4ae496924a05dc640 100644 (file)
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -1,32 +1,50 @@
 class NotesController < ApplicationController
 class NotesController < ApplicationController

-  layout "site"
+  include UserMethods
+
+  layout :map_layout

 
   before_action :check_api_readable
   before_action :authorize_web
 
   before_action :check_api_readable
   before_action :authorize_web

+  before_action :require_oauth

 
   authorize_resource
 
 
   authorize_resource
 

+  before_action :lookup_user, :only => [:index]

   before_action :set_locale
   around_action :web_timeout
 
   ##
   # Display a list of notes by a specified user
   def index
   before_action :set_locale
   around_action :web_timeout
 
   ##
   # Display a list of notes by a specified user
   def index

-    if params[:display_name]
-      if @user = User.active.find_by(:display_name => params[:display_name])
-        @params = params.permit(: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)
-      else
-        @title = t "users.no_such_user.title"
-        @not_found_user = params[:display_name]
-
-        render :template => "users/no_such_user", :status => :not_found
-      end
+    param! :page, Integer, :min => 1
+
+    @params = params.permit(:display_name, :status)
+    @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.where(:status => params[:status]) unless params[:status] == "all" || params[:status].blank?
+    @notes = @notes.order("updated_at DESC, id").distinct.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author)
+
+    render :layout => "site"
+  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
     end

+  rescue ActiveRecord::RecordNotFound
+    render :template => "browse/not_found", :status => :not_found
+  end
+
+  def new
+    render :action => :new_readonly if api_status != "online"

   end
 end
   end
 end