diff --git a/app/controllers/admin/budgets_controller.rb b/app/controllers/admin/budgets_controller.rb
index 88fbdf5c9..30395face 100644
--- a/app/controllers/admin/budgets_controller.rb
+++ b/app/controllers/admin/budgets_controller.rb
@@ -70,9 +70,6 @@ class Admin::BudgetsController < Admin::BaseController
descriptions = Budget::Phase::PHASE_KINDS.map { |p| "description_#{p}" }.map(&:to_sym)
valid_attributes = [:phase,
:currency_symbol,
- :help_link,
- :milestone_tag_list,
- :valuation_tag_list,
administrator_ids: [],
valuator_ids: [],
tracker_ids: []
diff --git a/app/helpers/budgets_helper.rb b/app/helpers/budgets_helper.rb
index 943467d86..ddbc1c093 100644
--- a/app/helpers/budgets_helper.rb
+++ b/app/helpers/budgets_helper.rb
@@ -54,10 +54,7 @@ module BudgetsHelper
end
def investment_tags_select_options(budget, context)
- taggables = [budget] + budget.investments
- Tag.joins(:taggings)
- .merge(Tagging.where(taggable: taggables, context: context))
- .distinct.order(:name).pluck(:name)
+ budget.investments.tags_on(context).order(:name).pluck(:name)
end
def unfeasible_or_unselected_filter
diff --git a/app/models/budget.rb b/app/models/budget.rb
index c0c772598..41a6c0869 100644
--- a/app/models/budget.rb
+++ b/app/models/budget.rb
@@ -4,9 +4,6 @@ class Budget < ApplicationRecord
include StatsVersionable
include Reportable
- acts_as_taggable_on :valuation_tags
- acts_as_taggable_on :milestone_tags
-
translates :name, touch: true
include Globalizable
diff --git a/app/views/admin/budgets/_form.html.erb b/app/views/admin/budgets/_form.html.erb
index 93c827512..fbd7686b8 100644
--- a/app/views/admin/budgets/_form.html.erb
+++ b/app/views/admin/budgets/_form.html.erb
@@ -38,22 +38,6 @@
<%= render "/admin/budgets/association", assignable_type: "trackers", assignables: @trackers, form: f %>
-
-
- <%= f.text_field :milestone_tag_list,
- value: @budget.milestone_tag_list.sort.join(","),
- placeholder: t("admin.budget_investments.edit.tags_placeholder") %>
-
-
- <%= f.text_field :valuation_tag_list,
- value: @budget.valuation_tag_list.sort.join(","),
- placeholder: t("admin.budget_investments.edit.tags_placeholder") %>
-
-
- <%= f.text_field :help_link %>
-
-
-
<% if @budget.phases.present? %>
diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml
index 5fde670bc..82091f0f4 100644
--- a/config/locales/en/activerecord.yml
+++ b/config/locales/en/activerecord.yml
@@ -141,9 +141,6 @@ en:
description_finished: "Description when the budget is finished"
phase: "Phase"
currency_symbol: "Currency"
- milestone_tag_list: "Milestone tags"
- valuation_tag_list: "Valuation tags"
- help_link: "Help link"
budget/translation:
name: "Name"
budget/investment:
diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml
index b9bc5c083..5fe4b0d77 100644
--- a/config/locales/es/activerecord.yml
+++ b/config/locales/es/activerecord.yml
@@ -143,9 +143,6 @@ es:
description_finished: "Descripción cuando el presupuesto ha finalizado / Resultados"
phase: "Fase"
currency_symbol: "Divisa"
- milestone_tag_list: "Etiquetas de seguimiento"
- valuation_tag_list: "Etiquetas de evaluación"
- help_link: "Enlace de ayuda"
budget/translation:
name: "Nombre"
budget/investment:
diff --git a/db/migrate/20191031210734_remove_help_link_from_budgets.rb b/db/migrate/20191031210734_remove_help_link_from_budgets.rb
new file mode 100644
index 000000000..7d8590097
--- /dev/null
+++ b/db/migrate/20191031210734_remove_help_link_from_budgets.rb
@@ -0,0 +1,6 @@
+class RemoveHelpLinkFromBudgets < ActiveRecord::Migration[5.0]
+ def change
+ remove_column :budgets, :help_link, :string
+ remove_column :tags, :budgets_count, :integer, default: 0
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ac6912bbc..79d28c3fc 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20191031173943) do
+ActiveRecord::Schema.define(version: 20191031210734) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -407,7 +407,6 @@ ActiveRecord::Schema.define(version: 20191031173943) do
t.text "description_drafting"
t.text "description_publishing_prices"
t.text "description_informing"
- t.string "help_link"
end
create_table "campaigns", force: :cascade do |t|
@@ -1485,8 +1484,6 @@ ActiveRecord::Schema.define(version: 20191031173943) do
t.integer "budget/investments_count", default: 0
t.integer "legislation/proposals_count", default: 0
t.integer "legislation/processes_count", default: 0
- t.integer "budgets_count", default: 0
- t.index ["budgets_count"], name: "index_tags_on_budgets_count", using: :btree
t.index ["debates_count"], name: "index_tags_on_debates_count", using: :btree
t.index ["legislation/processes_count"], name: "index_tags_on_legislation/processes_count", using: :btree
t.index ["legislation/proposals_count"], name: "index_tags_on_legislation/proposals_count", using: :btree