diff --git a/app/controllers/prompts/tags_controller.rb b/app/controllers/prompts/tags_controller.rb deleted file mode 100644 index 3d32a071e..000000000 --- a/app/controllers/prompts/tags_controller.rb +++ /dev/null @@ -1,9 +0,0 @@ -class Prompts::TagsController < ApplicationController - def index - @tags = Current.account.tags.all.alphabetically - - if stale? etag: @tags - render layout: false - end - end -end diff --git a/app/helpers/rich_text_helper.rb b/app/helpers/rich_text_helper.rb index c580b4507..e40fb8138 100644 --- a/app/helpers/rich_text_helper.rb +++ b/app/helpers/rich_text_helper.rb @@ -7,10 +7,6 @@ module RichTextHelper content_tag "lexxy-prompt", "", trigger: "@", src: prompts_users_path, name: "mention" end - def tags_prompt - content_tag "lexxy-prompt", "", trigger: "#", src: prompts_tags_path, name: "tag" - end - def cards_prompt content_tag "lexxy-prompt", "", trigger: "#", src: prompts_cards_path, name: "card", "insert-editable-text": true, "remote-filtering": true, "supports-space-in-searches": true end diff --git a/app/models/tag.rb b/app/models/tag.rb index 192f0b86e..d40eeea7b 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -1,5 +1,5 @@ class Tag < ApplicationRecord - include Attachable, Filterable + include ActionText::Attachable, Filterable belongs_to :account, default: -> { Current.account } has_many :taggings, dependent: :destroy diff --git a/app/models/tag/attachable.rb b/app/models/tag/attachable.rb deleted file mode 100644 index 37d95b2dd..000000000 --- a/app/models/tag/attachable.rb +++ /dev/null @@ -1,11 +0,0 @@ -module Tag::Attachable - extend ActiveSupport::Concern - - included do - include ActionText::Attachable - - def attachable_plain_text_representation(...) - "##{title}" - end - end -end diff --git a/app/views/prompts/tags/_tag.html.erb b/app/views/prompts/tags/_tag.html.erb deleted file mode 100644 index 3be999a8e..000000000 --- a/app/views/prompts/tags/_tag.html.erb +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/app/views/prompts/tags/index.html.erb b/app/views/prompts/tags/index.html.erb deleted file mode 100644 index 7ff9bbb1f..000000000 --- a/app/views/prompts/tags/index.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%= render partial: "prompts/tags/tag", collection: @tags %> diff --git a/config/routes.rb b/config/routes.rb index 55262e78e..d228d9001 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -190,7 +190,6 @@ Rails.application.routes.draw do namespace :prompts do resources :cards - resources :tags resources :users resources :boards do diff --git a/test/controllers/prompts/tags_controller_test.rb b/test/controllers/prompts/tags_controller_test.rb deleted file mode 100644 index 9ddea6fae..000000000 --- a/test/controllers/prompts/tags_controller_test.rb +++ /dev/null @@ -1,12 +0,0 @@ -require "test_helper" - -class Prompts::TagsControllerTest < ActionDispatch::IntegrationTest - setup do - sign_in_as :kevin - end - - test "index" do - get prompts_tags_path - assert_response :success - end -end