diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb index bd18dfcaf..05779c666 100644 --- a/app/controllers/notes_controller.rb +++ b/app/controllers/notes_controller.rb @@ -7,10 +7,12 @@ class NotesController < NestedNodeResourceController include MultipleDestroy include NodesSidebar include NotificationsReader + include Previewable before_action :find_or_initialize_note, except: [:index, :new, :multiple_destroy] before_action :initialize_nodes_sidebar, only: [:edit, :new, :show] before_action :set_auto_save_key, only: [:new, :create, :edit, :update] + before_action :set_form_preview_path, only: [:new, :edit] def new @note = @node.notes.new @@ -99,4 +101,8 @@ def set_auto_save_key "node-#{@node.id}-note" end end + + def set_form_preview_path + @form_preview_path = { preview_url: preview_project_node_note_path } + end end diff --git a/app/views/notes/_form.html.erb b/app/views/notes/_form.html.erb index 4a6dbdd51..ad173d8a2 100644 --- a/app/views/notes/_form.html.erb +++ b/app/views/notes/_form.html.erb @@ -17,7 +17,7 @@ data: { allow_dropdown: @note.new_record?, behavior: 'auto-save rich-toolbar drop-zone', - paths: editor_paths, + paths: editor_paths.merge!(@form_preview_path), 'rich-toolbar': 'block-code bold field image italic link list-ol list-ul table', 'rich-toolbar-uploader': '[data-behavior~=jquery-upload]', }, diff --git a/config/routes.rb b/config/routes.rb index 09d148618..d84520fd8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -86,7 +86,7 @@ resource :merge, only: [:create], controller: 'nodes/merge' - resources :notes, concerns: :multiple_destroy do + resources :notes, concerns: [:multiple_destroy, :previewable] do resources :revisions, only: [:index, :show] end