diff --git a/app/controllers/prompts/collections/users_controller.rb b/app/controllers/prompts/collections/users_controller.rb new file mode 100644 index 000000000..22c74cd58 --- /dev/null +++ b/app/controllers/prompts/collections/users_controller.rb @@ -0,0 +1,8 @@ +class Prompts::Collections::UsersController < ApplicationController + include CollectionScoped + + def index + @users = @collection.users + render layout: false + end +end diff --git a/app/controllers/prompts/users_controller.rb b/app/controllers/prompts/users_controller.rb deleted file mode 100644 index 1aaf995c4..000000000 --- a/app/controllers/prompts/users_controller.rb +++ /dev/null @@ -1,6 +0,0 @@ -class Prompts::UsersController < ApplicationController - def index - @users = User.all - render layout: false - end -end diff --git a/app/helpers/rich_text_helper.rb b/app/helpers/rich_text_helper.rb index 42c7cf5f1..2e0b63a93 100644 --- a/app/helpers/rich_text_helper.rb +++ b/app/helpers/rich_text_helper.rb @@ -1,6 +1,6 @@ module RichTextHelper - def mentions_prompt - content_tag "lexical-prompt", "", trigger: "@", src: prompts_users_path, name: "mention" + def mentions_prompt(collection) + content_tag "lexical-prompt", "", trigger: "@", src: prompts_collection_users_path(collection), name: "mention" end def cards_prompt diff --git a/app/views/cards/comments/_new.html.erb b/app/views/cards/comments/_new.html.erb index 8237fda1e..07802b0f0 100644 --- a/app/views/cards/comments/_new.html.erb +++ b/app/views/cards/comments/_new.html.erb @@ -11,7 +11,7 @@ action: "turbo:submit-end->local-save#submit keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop" } do |form| %> <%= form.rich_textarea :body, required: true, placeholder: new_comment_placeholder(card), data: { local_save_target: "input", action: "actiontext:change->local-save#save turbo:morph-element->local-save#restoreContent" } do %> - <%= mentions_prompt %> + <%= mentions_prompt(@card.collection) %> <%= cards_prompt %> <% end %> <%= form.button class: "comment__submit btn btn--reversed flex-item-justify-start" do %> diff --git a/app/views/cards/comments/edit.html.erb b/app/views/cards/comments/edit.html.erb index ebf55a8b1..d236e1b79 100644 --- a/app/views/cards/comments/edit.html.erb +++ b/app/views/cards/comments/edit.html.erb @@ -9,7 +9,7 @@ <%= form_with model: [ @card, @comment ], class: "flex flex-column gap full-width", data: { controller: "form", action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop" } do |form| %> <%= form.rich_textarea :body, required: true, autofocus: true, placeholder: new_comment_placeholder(@card) do %> - <%= mentions_prompt %> + <%= mentions_prompt(@card.collection) %> <%= cards_prompt %> <% end %>
diff --git a/app/views/cards/container/_title.html.erb b/app/views/cards/container/_title.html.erb index e95064726..fe66f6020 100644 --- a/app/views/cards/container/_title.html.erb +++ b/app/views/cards/container/_title.html.erb @@ -21,7 +21,7 @@ <%= form.rich_textarea :description, class: "card-field__description", placeholder: "Add some notes, context, pictures, or video about this…", data: { action: "actiontext:change->auto-save#change focusout->auto-save#submit keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop" } do %> - <%= mentions_prompt %> + <%= mentions_prompt(card.collection) %> <%= cards_prompt %> <% end %>
diff --git a/app/views/cards/edit.html.erb b/app/views/cards/edit.html.erb index 03b1ae325..e438dbbdb 100644 --- a/app/views/cards/edit.html.erb +++ b/app/views/cards/edit.html.erb @@ -11,7 +11,7 @@ <%= form.rich_textarea :description, class: "card-field__description rich-text-content", placeholder: "Add some notes, context, pictures, or video about this…", data: { action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop" } do %> - <%= mentions_prompt %> + <%= mentions_prompt(@card.collection) %> <%= cards_prompt %> <% end %> diff --git a/app/views/prompts/users/_user.html.erb b/app/views/prompts/collections/users/_user.html.erb similarity index 100% rename from app/views/prompts/users/_user.html.erb rename to app/views/prompts/collections/users/_user.html.erb diff --git a/app/views/prompts/collections/users/index.html.erb b/app/views/prompts/collections/users/index.html.erb new file mode 100644 index 000000000..3ece68eab --- /dev/null +++ b/app/views/prompts/collections/users/index.html.erb @@ -0,0 +1 @@ +<%= render partial: "prompts/collections/users/user", collection: @users %> diff --git a/app/views/prompts/users/index.html.erb b/app/views/prompts/users/index.html.erb deleted file mode 100644 index 4d78c50f9..000000000 --- a/app/views/prompts/users/index.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%= render partial: "prompts/users/user", collection: @users %> diff --git a/config/routes.rb b/config/routes.rb index 8032e842d..db0cf3cd6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -104,8 +104,12 @@ Rails.application.routes.draw do end namespace :prompts do - resources :users resources :cards + resources :collections do + scope module: :collections do + resources :users + end + end end namespace :public do