Commit 69b7537d authored by Justin Ho's avatar Justin Ho

Refactor backend to be clearer on values

And remove use of send / replace with public_send
parent 6396fba6
...@@ -172,19 +172,22 @@ class Service < ApplicationRecord ...@@ -172,19 +172,22 @@ class Service < ApplicationRecord
def configurable_events_json def configurable_events_json
configurable_events.map do |event| configurable_events.map do |event|
event_method = ServicesHelper.service_event_field_name(event) event_field_name = ServicesHelper.service_event_field_name(event)
result = { result = {
title: event, title: event,
name: event_method, name: event_field_name,
value: send(event_method), # rubocop:disable GitlabSecurity/PublicSend value: self[event_field_name],
description: self.class.event_description(event) description: self.class.event_description(event)
} }
field = event_field(event)
if field if field = event_field(event)
result.merge({ field: { name: field[:name], value: send(field[:name]) } }) # rubocop:disable GitlabSecurity/PublicSend result[:field] = {
else name: field[:name],
result value: public_send(field[:name]) # rubocop:disable GitlabSecurity/PublicSend
}
end end
result
end.to_json end.to_json
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment