diff --git a/app/controllers/admin/tags_controller.rb b/app/controllers/admin/tags_controller.rb
index 82186ccaf..6bccb176a 100644
--- a/app/controllers/admin/tags_controller.rb
+++ b/app/controllers/admin/tags_controller.rb
@@ -4,7 +4,7 @@ class Admin::TagsController < Admin::BaseController
respond_to :html, :js
def index
- @tags = ActsAsTaggableOn::Tag.category.order(featured: :desc).page(params[:page])
+ @tags = ActsAsTaggableOn::Tag.category.page(params[:page])
@tag = ActsAsTaggableOn::Tag.category.new
end
@@ -13,11 +13,6 @@ class Admin::TagsController < Admin::BaseController
redirect_to admin_tags_path
end
- def update
- @tag.update(tag_params)
- redirect_to admin_tags_path
- end
-
def destroy
@tag.destroy
redirect_to admin_tags_path
@@ -26,7 +21,7 @@ class Admin::TagsController < Admin::BaseController
private
def tag_params
- params.require(:tag).permit(:featured, :name)
+ params.require(:tag).permit(:name)
end
def find_tag
diff --git a/app/views/admin/tags/index.html.erb b/app/views/admin/tags/index.html.erb
index c1eda4b30..715479420 100644
--- a/app/views/admin/tags/index.html.erb
+++ b/app/views/admin/tags/index.html.erb
@@ -8,12 +8,6 @@
<%= f.text_field :name, placeholder: t("admin.tags.name.placeholder"), label: false %>
-
- <%= f.label :featured do %>
- <%= f.check_box :featured, title: t('admin.tags.mark_as_featured'), label: false %>
- <%= t("admin.tags.mark_as_featured") %>
- <% end %>
-
<%= f.submit(t("admin.tags.create"), class: "button success") %>
@@ -33,13 +27,8 @@
<%= tag.name %>
- <%= f.label "featured_#{tag.id}" do %>
- <%= f.check_box :featured, title: t('admin.tags.mark_as_featured'), label: false, id: "tag_featured_#{tag.id}", class: "inline-block" %>
- <%= t("admin.tags.mark_as_featured") %>
- <% end %>
- <%= f.submit(t("admin.tags.update"), class: "button hollow on-hover") %>
<%= link_to t("admin.tags.destroy"), admin_tag_path(tag), method: :delete, class: "button hollow alert on-hover" %>
<% end %>
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml
index bbd8dd1bd..7638ce535 100755
--- a/config/locales/admin.en.yml
+++ b/config/locales/admin.en.yml
@@ -812,10 +812,8 @@ en:
index:
add_tag: Add a new proposal topic
title: Proposal topics
- mark_as_featured: Propose topic upon creating proposal
name:
placeholder: Type the name of the topic
- update: Update Topic
users:
columns:
name: Name
diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml
index a3c6a99b9..92d5fb534 100644
--- a/config/locales/admin.es.yml
+++ b/config/locales/admin.es.yml
@@ -812,10 +812,8 @@ es:
index:
add_tag: Añade un nuevo tema de propuesta
title: Temas de propuesta
- mark_as_featured: Proponer tema al crear propuesta
name:
placeholder: Escribe el nombre del tema
- update: Actualizar Tema
users:
columns:
name: Nombre
diff --git a/config/locales/admin.fr.yml b/config/locales/admin.fr.yml
index 8100a95a6..d020a5690 100644
--- a/config/locales/admin.fr.yml
+++ b/config/locales/admin.fr.yml
@@ -644,10 +644,8 @@ fr:
index:
add_tag: Ajouter un nouveau sujet de proposition
title: Sujets de propositions
- mark_as_featured: Proposer le sujet lors de la création d'une proposition
name:
placeholder: Saisir le nom du sujet
- update: Mettre-à-jour le sujet
users:
index:
filter: Filtrer
diff --git a/config/locales/admin.nl.yml b/config/locales/admin.nl.yml
index 40b21ed32..f31313cf4 100755
--- a/config/locales/admin.nl.yml
+++ b/config/locales/admin.nl.yml
@@ -641,10 +641,8 @@ nl:
index:
add_tag: Add a new proposal topic
title: Proposal topics
- mark_as_featured: Propose topic upon creating proposal
name:
placeholder: Type the name of the topic
- update: Update Topic
users:
index:
filter: Filter
diff --git a/spec/features/admin/tags_spec.rb b/spec/features/admin/tags_spec.rb
index 7d5119162..dd9c38c6b 100644
--- a/spec/features/admin/tags_spec.rb
+++ b/spec/features/admin/tags_spec.rb
@@ -31,21 +31,6 @@ feature 'Admin tags' do
expect(page).to have_content 'important issues'
end
- scenario 'Update' do
- visit admin_tags_path
- featured_checkbox = find("#tag_featured_#{@tag1.id}")
- expect(featured_checkbox.checked?).to be_blank
-
- within("#edit_tag_#{@tag1.id}") do
- check "tag_featured_#{@tag1.id}"
- click_button 'Update Topic'
- end
-
- visit admin_tags_path
- featured_checkbox = find("#tag_featured_#{@tag1.id}")
- expect(featured_checkbox.checked?).to eq(true)
- end
-
scenario 'Delete' do
tag2 = create(:tag, :category, name: "bad tag")
create(:debate, tag_list: tag2.name)
@@ -101,17 +86,6 @@ feature 'Admin tags' do
expect(ActsAsTaggableOn::Tag.category.where(name: "wow_category")).to exist
end
-
- scenario "Update doesn't affect the category kind" do
- visit admin_tags_path
-
- within("#edit_tag_#{@tag1.id}") do
- check "tag_featured_#{@tag1.id}"
- click_button 'Update Topic'
- end
-
- expect(ActsAsTaggableOn::Tag.category.where(id: @tag1.id)).to exist
- end
end
end