Move browse#new_note to notes#new

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

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 7d6163f4886b08ae97c7e5716c706ca69df71703..4c1bac1934d8feb6def7cc93790e47fd72696cbd 100644 (file)
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -1,8 +1,9 @@
 class NotesController < ApplicationController
 class NotesController < ApplicationController

-  layout "site"
+  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
 


@@ -21,12 +22,16 @@ class NotesController < ApplicationController
         @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)
         @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]
 
       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
       end
     end
   end

+
+  def new; end

 end
 end