Remove featured attribute management on admin/tags

This commit is contained in:
Eduardo Martinez Echevarria
2017-06-23 15:43:49 +02:00
parent eb2e5c58b6
commit e60ffa3c00
7 changed files with 2 additions and 52 deletions

View File

@@ -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

View File

@@ -8,12 +8,6 @@
<%= f.text_field :name, placeholder: t("admin.tags.name.placeholder"), label: false %>
</div>
<div class="is-featured small-12 medium-6 column">
<%= f.label :featured do %>
<%= f.check_box :featured, title: t('admin.tags.mark_as_featured'), label: false %>
<span class="checkbox"><%= t("admin.tags.mark_as_featured") %></span>
<% end %>
</div>
</div>
<%= f.submit(t("admin.tags.create"), class: "button success") %>
@@ -33,13 +27,8 @@
<span class="float-left text-left">
<strong><%= tag.name %></strong>
<%= 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" %>
<span class="checkbox inline-block"><%= t("admin.tags.mark_as_featured") %></span>
<% end %>
</span>
<%= 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 %>
</td>

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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