<%= t("admin.audits.empty") %>
+<% else %> +| <%= t("admin.audits.id") %> | +<%= t("admin.audits.field") %> | +<%= t("admin.audits.old_value") %> | +<%= t("admin.audits.new_value") %> | +<%= t("admin.audits.edited_at") %> | +<%= t("admin.audits.edited_by") %> | +<%= t("admin.audits.actions") %> | +
|---|---|---|---|---|---|---|
| <%= audit.id %> | +<%= sanitize(resource.class.human_attribute_name(field)) %> | +
+ <%= truncate_audit_value(resource, field, old_value) %>
+ |
+
+ <%= truncate_audit_value(resource, field, new_value) %>
+ |
+ + <%= l audit.created_at.to_date %> + | ++ <%= audit.user&.name %> + | ++ <%= link_to t("shared.show"), + polymorphic_path([:admin, *resource_hierarchy_for(audit)]), + class: "button hollow primary" %> + | +
<%= t("admin.audits.edited_at") %> <%= l @audit.created_at.to_date %>
+<%= t("admin.audits.edited_by") %> <%= @audit.user&.name %>
+ +<%= sanitize(@audit.auditable.class.human_attribute_name(field)) %>
+ <%= t("admin.audits.old_value") %> +<%= wysiwyg(audit_value(@audit.auditable, field, old_value)) %>
+ <%= t("admin.audits.new_value") %> +<%= wysiwyg(audit_value(@audit.auditable, field, new_value)) %>
+<% end %> diff --git a/app/views/admin/budget_investments/_written_by_author.html.erb b/app/views/admin/budget_investments/_written_by_author.html.erb index f030aac91..63e48d4b6 100644 --- a/app/views/admin/budget_investments/_written_by_author.html.erb +++ b/app/views/admin/budget_investments/_written_by_author.html.erb @@ -41,7 +41,7 @@<%= t("admin.budget_investments.show.selection.title") %>: - <%= t("admin.budget_investments.show.selection.#{@investment.selected?}") %> + <%= @investment.class.human_attribute_name("selected_#{@investment.selected?}") %>
| <%= t("admin.change_log.id") %> | -<%= t("admin.change_log.field") %> | -<%= t("admin.change_log.old_value") %> | -<%= t("admin.change_log.new_value") %> | -<%= t("admin.change_log.edited_at") %> | -<%= t("admin.change_log.edited_by") %> | -<%= t("admin.change_log.actions") %> | -
|---|---|---|---|---|---|---|
| <%= log.id %> | -<%= log.field.capitalize %> | -
- <%= log.old_value %>
- |
-
- <%= log.new_value %>
- |
- - <%= log.created_at.to_date %> - | -- <%= log.author.name unless log.author.nil? %> - | -- <%= link_to admin_change_log_path(id: log) do %> - - <% end %> - | -
<%= @log.id %>
- -<%= @log.old_value %>
- -<%= @log.new_value %>
- -<%= @log.created_at.to_date %>
- -<%= @log.author.name unless @log.author.nil? %>
diff --git a/config/initializers/audited.rb b/config/initializers/audited.rb new file mode 100644 index 000000000..74ad9b5a3 --- /dev/null +++ b/config/initializers/audited.rb @@ -0,0 +1,3 @@ +Audited.config do |config| + config.audit_class = ::Audit +end diff --git a/config/initializers/routes_hierarchy.rb b/config/initializers/routes_hierarchy.rb index 82b99cf2d..6223d9e74 100644 --- a/config/initializers/routes_hierarchy.rb +++ b/config/initializers/routes_hierarchy.rb @@ -13,6 +13,8 @@ module ActionDispatch::Routing::UrlFor [*resource_hierarchy_for(resource.milestoneable), resource] when "ProgressBar" [*resource_hierarchy_for(resource.progressable), resource] + when "Audit" + [*resource_hierarchy_for(resource.associated || resource.auditable), resource] when "Legislation::Annotation" [resource.draft_version.process, resource.draft_version, resource] when "Legislation::Proposal", "Legislation::Question", "Legislation::DraftVersion" diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index 82091f0f4..e4acbae92 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -161,6 +161,8 @@ en: milestone_tag_list: "Milestone tags" price_explanation: "Price explanation" selected: "Mark as selected" + selected_true: "Selected" + selected_false: "Not selected" unfeasibility_explanation: "Feasibility explanation" valuation_finished: "Valuation finished" valuator_ids: "Groups" diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index e315b5142..30d69b5d1 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -241,8 +241,6 @@ en: "false": Compatible selection: title: Selection - "true": Selected - "false": Not selected winner: title: Winner "true": "Yes" @@ -1583,8 +1581,9 @@ en: submit_header: Save header card_title: Edit card submit_card: Save card - change_log: + audits: title: "Change Log" + changes: "List of changes" id: "ID" field: "Field" new_value: "New Value" @@ -1592,7 +1591,7 @@ en: edited_at: "Edited at" edited_by: "Edited by" actions: "Actions" - empty: "There are not changes logged" + empty: "There are no changes logged" local_census_records: index: title: Manage local census diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml index 5fe4b0d77..69c5f1956 100644 --- a/config/locales/es/activerecord.yml +++ b/config/locales/es/activerecord.yml @@ -163,6 +163,8 @@ es: milestone_tag_list: "Etiquetas de Seguimiento" price_explanation: "Informe de coste (opcional, dato público)" selected: "Marcar como seleccionado" + selected_true: "Seleccionado" + selected_false: "No seleccionado" unfeasibility_explanation: "Informe de inviabilidad (en caso de que lo sea, dato público)" valuation_finished: "Informe finalizado" valuator_ids: "Grupos" diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index e7f998dd5..256db29ec 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -241,8 +241,6 @@ es: "false": Compatible selection: title: Selección - "true": Seleccionado - "false": No seleccionado winner: title: Ganador "true": "Si" @@ -1582,8 +1580,9 @@ es: submit_header: Guardar encabezado card_title: Editar tarjeta submit_card: Guardar tarjeta - change_log: + audits: title: "Historial" + changes: "Lista de cambios" id: "ID" field: "Campo" new_value: "Valor nuevo" diff --git a/config/routes/admin.rb b/config/routes/admin.rb index eb8af3fbf..d28093d52 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -63,6 +63,7 @@ namespace :admin do resources :budget_investments, only: [:index, :show, :edit, :update] do member { patch :toggle_selection } + resources :audits, only: :show, controller: "budget_investment_audits" resources :milestones, controller: "budget_investment_milestones" resources :progress_bars, except: :show, controller: "budget_investment_progress_bars" end @@ -250,8 +251,6 @@ namespace :admin do get "download_settings/:resource", to: "download_settings#edit", as: "edit_download_settings" put "download_settings/:resource", to: "download_settings#update", as: "update_download_settings" - get "/change_log/:id", to: "budget_investments#show_investment_log", as: "change_log" - resources :local_census_records namespace :local_census_records do resources :imports, only: [:new, :create, :show] diff --git a/db/dev_seeds/budgets.rb b/db/dev_seeds/budgets.rb index 3904ee694..a1e4738f2 100644 --- a/db/dev_seeds/budgets.rb +++ b/db/dev_seeds/budgets.rb @@ -121,13 +121,16 @@ section "Creating Investments" do 100.times do heading = Budget::Heading.all.sample - investment = Budget::Investment.create!( + translation_attributes = random_locales.each_with_object({}) do |locale, attributes| + attributes["title_#{locale.to_s.underscore}"] = "Title for locale #{locale}" + attributes["description_#{locale.to_s.underscore}"] = "Description for locale #{locale}
" + end + + investment = Budget::Investment.create!({ author: User.all.sample, heading: heading, group: heading.group, budget: heading.group.budget, - title: Faker::Lorem.sentence(3).truncate(60), - description: "#{Faker::Lorem.paragraphs.join("
")}
", created_at: rand((Time.current - 1.week)..Time.current), feasibility: %w[undecided unfeasible feasible feasible feasible feasible].sample, unfeasibility_explanation: Faker::Lorem.paragraph, @@ -136,15 +139,7 @@ section "Creating Investments" do price: rand(1..100) * 100000, skip_map: "1", terms_of_service: "1" - ) - - random_locales.map do |locale| - Globalize.with_locale(locale) do - investment.title = "Title for locale #{locale}" - investment.description = "Description for locale #{locale}
" - investment.save! - end - end + }.merge(translation_attributes)) add_image_to(investment) if Random.rand > 0.5 end diff --git a/db/migrate/20191102002206_install_audited.rb b/db/migrate/20191102002206_install_audited.rb new file mode 100644 index 000000000..91e8204b7 --- /dev/null +++ b/db/migrate/20191102002206_install_audited.rb @@ -0,0 +1,26 @@ +class InstallAudited < ActiveRecord::Migration[5.0] + def change + create_table :audits, force: true do |t| + t.column :auditable_id, :integer + t.column :auditable_type, :string + t.column :associated_id, :integer + t.column :associated_type, :string + t.column :user_id, :integer + t.column :user_type, :string + t.column :username, :string + t.column :action, :string + t.column :audited_changes, :jsonb + t.column :version, :integer, default: 0 + t.column :comment, :string + t.column :remote_address, :string + t.column :request_uuid, :string + t.column :created_at, :datetime + end + + add_index :audits, [:auditable_type, :auditable_id, :version], name: "auditable_index" + add_index :audits, [:associated_type, :associated_id], name: "associated_index" + add_index :audits, [:user_id, :user_type], name: "user_index" + add_index :audits, :request_uuid + add_index :audits, :created_at + end +end diff --git a/db/migrate/20191102002238_drop_budget_investment_change_logs.rb b/db/migrate/20191102002238_drop_budget_investment_change_logs.rb new file mode 100644 index 000000000..29582d068 --- /dev/null +++ b/db/migrate/20191102002238_drop_budget_investment_change_logs.rb @@ -0,0 +1,13 @@ +class DropBudgetInvestmentChangeLogs < ActiveRecord::Migration[5.0] + def change + drop_table :budget_investment_change_logs do |t| + t.integer :investment_id + t.integer :author_id + t.string :field + t.string :new_value + t.string :old_value + + t.timestamps null: false + end + end +end diff --git a/db/schema.rb b/db/schema.rb index c6f941612..aad613106 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: 20191101183155) do +ActiveRecord::Schema.define(version: 20191102002238) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -84,6 +84,28 @@ ActiveRecord::Schema.define(version: 20191101183155) do t.index ["visit_id"], name: "index_ahoy_events_on_visit_id", using: :btree end + create_table "audits", force: :cascade do |t| + t.integer "auditable_id" + t.string "auditable_type" + t.integer "associated_id" + t.string "associated_type" + t.integer "user_id" + t.string "user_type" + t.string "username" + t.string "action" + t.jsonb "audited_changes" + t.integer "version", default: 0 + t.string "comment" + t.string "remote_address" + t.string "request_uuid" + t.datetime "created_at" + t.index ["associated_type", "associated_id"], name: "associated_index", using: :btree + t.index ["auditable_type", "auditable_id", "version"], name: "auditable_index", using: :btree + t.index ["created_at"], name: "index_audits_on_created_at", using: :btree + t.index ["request_uuid"], name: "index_audits_on_request_uuid", using: :btree + t.index ["user_id", "user_type"], name: "user_index", using: :btree + end + create_table "banner_sections", force: :cascade do |t| t.integer "banner_id" t.integer "web_section_id" @@ -203,16 +225,6 @@ ActiveRecord::Schema.define(version: 20191101183155) do t.index ["group_id"], name: "index_budget_headings_on_group_id", using: :btree end - create_table "budget_investment_change_logs", force: :cascade do |t| - t.integer "investment_id" - t.integer "author_id" - t.string "field" - t.string "new_value" - t.string "old_value" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - create_table "budget_investment_milestone_translations", force: :cascade do |t| t.integer "budget_investment_milestone_id", null: false t.string "locale", null: false diff --git a/spec/features/admin/audits_spec.rb b/spec/features/admin/audits_spec.rb new file mode 100644 index 000000000..66b45b334 --- /dev/null +++ b/spec/features/admin/audits_spec.rb @@ -0,0 +1,38 @@ +require "rails_helper" + +describe "Admin change log" do + let(:administrator) { create(:administrator, user: create(:user, username: "Ana")) } + before { login_as(administrator.user) } + + context "Investments Participatory Budgets" do + scenario "Changes" do + investment = create(:budget_investment, title: "Good old times") + + visit admin_budget_budget_investment_path(investment.budget, investment) + + expect(page).to have_content "There are no changes logged" + + click_link "Edit" + fill_in "Title", with: "Modern times" + click_button "Update" + + expect(page).not_to have_content "There are no changes logged" + expect(page).to have_content "Change Log" + + within("#audits thead") do + expect(page).to have_content "Field" + expect(page).to have_content "Old Value" + expect(page).to have_content "New Value" + expect(page).to have_content "Edited at" + expect(page).to have_content "Edited by" + end + + within("#audits tbody") do + expect(page).to have_content "Title" + expect(page).to have_content "Good old times" + expect(page).to have_content "Modern times" + expect(page).to have_content "Ana" + end + end + end +end diff --git a/spec/features/admin/change_log_spec.rb b/spec/features/admin/change_log_spec.rb deleted file mode 100644 index 74636f7c7..000000000 --- a/spec/features/admin/change_log_spec.rb +++ /dev/null @@ -1,68 +0,0 @@ -require "rails_helper" - -describe "Admin change log" do - let(:budget) { create(:budget) } - let(:administrator) do - create(:administrator, user: create(:user, username: "Ana", email: "ana@admins.org")) - end - - context "Investments Participatory Budgets" do - before do - login_as(create(:administrator).user) - end - - scenario "No changes" do - budget_investment = create(:budget_investment, - :unfeasible, - unfeasibility_explanation: "It is impossible", - price: 1234, - price_first_year: 1000, - administrator: administrator) - - visit admin_budget_budget_investments_path(budget_investment.budget) - - click_link budget_investment.title - - expect(page).to have_content(budget_investment.title) - expect(page).to have_content(budget_investment.description) - expect(page).to have_content(budget_investment.author.name) - expect(page).to have_content(budget_investment.heading.name) - expect(page).to have_content("There are not changes logged") - end - - scenario "Changes" do - budget_investment = create(:budget_investment, - :unfeasible, - unfeasibility_explanation: "It is impossible", - price: 1234, - price_first_year: 1000, - administrator: administrator) - - visit admin_budget_budget_investments_path(budget_investment.budget) - - click_link budget_investment.title - - expect(page).to have_content(budget_investment.title) - expect(page).to have_content(budget_investment.description) - expect(page).to have_content(budget_investment.author.name) - expect(page).to have_content(budget_investment.heading.name) - expect(page).to have_content("There are not changes logged") - - budget_investment.update!(title: "test") - - visit admin_budget_budget_investments_path(budget_investment.budget) - - click_link budget_investment.title - - expect(page).not_to have_content("There are not changes logged") - expect(page).to have_content("Change Log") - expect(page).to have_content("Title") - expect(page).to have_content("test") - expect(page).to have_content("Field") - expect(page).to have_content("Old Value") - expect(page).to have_content("New Value") - expect(page).to have_content("Edited at") - expect(page).to have_content("Edited by") - end - end -end