Skip to content

Add evidence on report to translatable columns for observation model #577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tsubik wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Add evidence on report to translatable columns for observation model #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3b2254
add evidence on report to translatable columns
tsubik Feb 23, 2026
7eb22ef
update fixtures
tsubik Feb 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions app/admin/observation.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ def scoped_collection

permit_params :name, :lng, :pv, :lat, :lon, :subcategory_id, :severity_id, :country_id, :operator_id, :user_type,
:validation_status, :publication_date, :observation_report_id, :location_information, :evidence_type,
:evidence_on_report, :location_accuracy, :law_id, :fmu_id, :hidden, :non_concession_activity,
:location_accuracy, :law_id, :fmu_id, :hidden, :non_concession_activity,
:actions_taken, :is_physical_place, :force_translations_from,
relevant_operator_ids: [], government_ids: [],
observation_document_ids: [],
translations_attributes: [:id, :locale, :details, :concern_opinion, :litigation_status, :_destroy]
translations_attributes: [:id, :locale, :details, :concern_opinion, :litigation_status, :evidence_on_report, :_destroy]

member_action :start_qc, method: [:put, :get] do
if resource.update(user_type: :reviewer, validation_status: "QC2 in progress")
Expand Down Expand Up @@ -502,7 +502,6 @@ def scoped_collection
f.input :actions_taken, **visibility
f.input :observation_report, as: :select, **visibility
f.input :evidence_type, as: :select, **visibility
f.input :evidence_on_report, **visibility
f.input :observation_documents,
as: :select,
collection: (f.object.observation_documents + (f.object.observation_report&.observation_documents || [])).uniq,
Expand All @@ -526,6 +525,8 @@ def scoped_collection
t.input :concern_opinion_translated_from, input_html: {disabled: true}
t.input :litigation_status, **visibility
t.input :litigation_status_translated_from, input_html: {disabled: true}
t.input :evidence_on_report, **visibility
t.input :evidence_on_report_translated_from, input_html: {disabled: true}
end
end
f.actions
Expand Down
2 changes: 1 addition & 1 deletion app/models/observation.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class Observation < ApplicationRecord
include ValidationHelper
include ObservationOldAttributes

translates :details, :concern_opinion, :litigation_status, touch: true, versioning: :paper_trail, paranoia: true
translates :details, :concern_opinion, :litigation_status, :evidence_on_report, touch: true, versioning: :paper_trail, paranoia: true
active_admin_translates :details, :concern_opinion, :litigation_status

WrongStateError = Class.new(StandardError)
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/observations/_attributes_table.html.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ panel I18n.t("active_admin.observations_page.details") do
end
translated_row :details
row :evidence_type
row :evidence_on_report
translated_row :evidence_on_report
translated_row :litigation_status
row :actions_taken
translated_row :concern_opinion
Expand Down
Loading