Unnest uploads controller
This commit is contained in:
+1
-1
@@ -1,4 +1,4 @@
|
||||
class ActionText::Markdown::UploadsController < ApplicationController
|
||||
class UploadsController < ApplicationController
|
||||
include ActiveStorage::SetCurrent
|
||||
|
||||
def create
|
||||
+3
-5
@@ -40,6 +40,9 @@ Rails.application.routes.draw do
|
||||
resource :first_run
|
||||
resource :session
|
||||
|
||||
resources :uploads, only: :create
|
||||
get "/u/*slug" => "uploads#show", as: :upload
|
||||
|
||||
resources :users do
|
||||
scope module: :users do
|
||||
resource :avatar
|
||||
@@ -50,11 +53,6 @@ Rails.application.routes.draw do
|
||||
resources :stages, module: :workflows
|
||||
end
|
||||
|
||||
namespace :action_text, path: nil do
|
||||
get "/u/*slug" => "markdown/uploads#show", as: :markdown_upload
|
||||
post "/uploads" => "markdown/uploads#create", as: :markdown_uploads
|
||||
end
|
||||
|
||||
get "join/:join_code", to: "users#new", as: :join
|
||||
post "join/:join_code", to: "users#create"
|
||||
get "up", to: "rails/health#show", as: :rails_health_check
|
||||
|
||||
@@ -3,7 +3,7 @@ module ActionText
|
||||
def markdown_area(record, name, value: nil, data: {}, **options)
|
||||
field_name = "#{record.class.model_name.param_key}[#{name}]"
|
||||
value = record.safe_markdown_attribute(name).content.to_s if value.nil?
|
||||
data = data.reverse_merge! uploads_url: action_text_markdown_uploads_url(format: "json")
|
||||
data = data.reverse_merge! uploads_url: uploads_url(format: "json")
|
||||
|
||||
tag.house_md value, name: field_name, data: data, **options
|
||||
end
|
||||
|
||||
@@ -6,7 +6,7 @@ module ActiveStorage::Sluggable
|
||||
end
|
||||
|
||||
def slug_url(host: ActiveStorage::Current.url_options[:host], port: ActiveStorage::Current.url_options[:port])
|
||||
Rails.application.routes.url_helpers.action_text_markdown_upload_url(slug, host: host, port: port)
|
||||
Rails.application.routes.url_helpers.upload_url(slug, host: host, port: port)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
Reference in New Issue
Block a user