diff --git a/app/controllers/content_change_requests_controller.rb b/app/controllers/content_change_requests_controller.rb index 861c5d4d1..6ac5085a0 100644 --- a/app/controllers/content_change_requests_controller.rb +++ b/app/controllers/content_change_requests_controller.rb @@ -19,7 +19,6 @@ def content_change_request_params :reason_for_change, :subject_area, :details_of_change, - :why_is_change_needed, :url, :related_urls, requester_attributes: %i[email name collaborator_emails], diff --git a/app/models/support/requests/content_change_request.rb b/app/models/support/requests/content_change_request.rb index 263c5e798..5f808a647 100644 --- a/app/models/support/requests/content_change_request.rb +++ b/app/models/support/requests/content_change_request.rb @@ -5,7 +5,7 @@ module Requests class ContentChangeRequest < Request include WithTimeConstraint - attr_accessor :title, :reason_for_change, :subject_area, :details_of_change, :why_is_change_needed, :url, :related_urls + attr_accessor :title, :reason_for_change, :subject_area, :details_of_change, :url, :related_urls validates :details_of_change, presence: true diff --git a/app/models/zendesk/ticket/content_change_request_ticket.rb b/app/models/zendesk/ticket/content_change_request_ticket.rb index 2eefa4d20..434a86a73 100644 --- a/app/models/zendesk/ticket/content_change_request_ticket.rb +++ b/app/models/zendesk/ticket/content_change_request_ticket.rb @@ -37,11 +37,6 @@ def comment_snippets field: :details_of_change, label: "Details of what should be added, amended or removed", ), - Zendesk::LabelledSnippet.new( - on: @request, - field: :why_is_change_needed, - label: "Why is this change needed", - ), ] end end diff --git a/app/models/zendesk/zendesk_ticket.rb b/app/models/zendesk/zendesk_ticket.rb index e91e459a2..513397dfe 100644 --- a/app/models/zendesk/zendesk_ticket.rb +++ b/app/models/zendesk/zendesk_ticket.rb @@ -29,6 +29,18 @@ def needed_by_date end end + def not_before_time + if value?(:time_constraint) && value?(:not_before_time, @request.time_constraint) + @request.time_constraint.not_before_time + end + end + + def needed_by_time + if value?(:time_constraint) && value?(:needed_by_time, @request.time_constraint) + @request.time_constraint.needed_by_time + end + end + def tags %w[govt_form] end @@ -49,7 +61,9 @@ def base_comment_snippets if value?(:time_constraint) [ Zendesk::LabelledSnippet.new(on: self, field: :needed_by_date, label: "Needed by date"), + Zendesk::LabelledSnippet.new(on: self, field: :needed_by_time, label: "Needed by time"), Zendesk::LabelledSnippet.new(on: self, field: :not_before_date, label: "Not before date"), + Zendesk::LabelledSnippet.new(on: self, field: :not_before_time, label: "Not before time"), Zendesk::LabelledSnippet.new(on: @request.time_constraint, field: :time_constraint_reason, label: "Reason for time constraint"), ] else diff --git a/app/views/content_change_requests/_request_details.html.erb b/app/views/content_change_requests/_request_details.html.erb index 095df788a..cb0527ddd 100644 --- a/app/views/content_change_requests/_request_details.html.erb +++ b/app/views/content_change_requests/_request_details.html.erb @@ -119,7 +119,7 @@
Make sure you:
Explain why users need new or different information, including any problems with existing content.
- -Provide evidence to support the changes, such as user feedback, user research, analytics, call centre feedback or policy change.