Skip to content

Commit d6a8e0f

Browse files
authored
Merge pull request #2883 from DFE-Digital/AQTS-1172-dev-application-stuck-in-verification-after-reverse-decision-on-a-decline
[AQTS-1172] Block verification update for qualification and lops if the application is no longer in verification
2 parents 0fe7893 + 70ed93d commit d6a8e0f

File tree

4 files changed

+30
-14
lines changed

4 files changed

+30
-14
lines changed

app/controllers/assessor_interface/qualification_requests_controller.rb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,12 @@ def update_verify_failed
236236
end
237237

238238
def edit_review
239-
@form = RequestableReviewForm.new(requestable:)
239+
@form =
240+
RequestableReviewForm.new(
241+
requestable:,
242+
passed: requestable.review_passed,
243+
note: requestable.review_note,
244+
)
240245
end
241246

242247
def update_review

app/controllers/assessor_interface/reference_requests_controller.rb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@ def index
1515
end
1616

1717
def edit_review
18-
@form = RequestableReviewForm.new(requestable:)
18+
@form =
19+
RequestableReviewForm.new(
20+
requestable:,
21+
passed: requestable.review_passed,
22+
note: requestable.review_note,
23+
)
1924
end
2025

2126
def update_review

app/views/assessor_interface/professional_standing_requests/edit_verify.html.erb

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<% content_for :page_title, title_with_error_prefix("Record LoPS response", error: @form.errors.any?) %>
22
<% content_for :back_link_url, assessor_interface_application_form_assessment_professional_standing_request_path %>
3+
<% can_update_verify_lops_request = @assessment.verify? && policy([:assessor_interface, @professional_standing_request]).update_verify? %>
34

45
<%= form_with model: @form, url: [:verify, :assessor_interface, @application_form, @assessment, :professional_standing_request] do |f| %>
56
<%= f.govuk_error_summary %>
@@ -23,17 +24,19 @@
2324
"Does the response confirm that the LoPS is valid?" %>
2425

2526
<%= f.govuk_radio_buttons_fieldset :passed, legend: { text: legend, size: "s" } do %>
26-
<%= f.govuk_radio_button :passed, :true, link_errors: true %>
27+
<%= f.govuk_radio_button :passed, :true, link_errors: true, disabled: !can_update_verify_lops_request %>
2728

2829
<% if @professional_standing_request.expired? %>
29-
<%= f.govuk_radio_button :passed, :false do %>
30-
<%= f.govuk_radio_button :received, :true %>
31-
<%= f.govuk_radio_button :received, :false %>
30+
<%= f.govuk_radio_button :passed, :false, disabled: !can_update_verify_lops_request do %>
31+
<%= f.govuk_radio_button :received, :true, disabled: !can_update_verify_lops_request %>
32+
<%= f.govuk_radio_button :received, :false, disabled: !can_update_verify_lops_request %>
3233
<% end %>
3334
<% else %>
34-
<%= f.govuk_radio_button :passed, :false %>
35+
<%= f.govuk_radio_button :passed, :false, disabled: !can_update_verify_lops_request %>
3536
<% end %>
3637
<% end %>
3738

38-
<%= render "shared/assessor_interface/continue_cancel_button", f: %>
39+
<%= f.govuk_submit disabled: !can_update_verify_lops_request do %>
40+
<%= render "shared/assessor_interface/cancel_link" %>
41+
<% end %>
3942
<% end %>

app/views/assessor_interface/qualification_requests/edit_verify.html.erb

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<% title = "Record Ecctis response" %>
2+
<% can_update_verify_qualification_request = @assessment.verify? && policy([:assessor_interface, @qualification_request]).update_verify? %>
23

34
<% content_for :page_title, title_with_error_prefix(title, error: @form.errors.any?) %>
45
<% content_for :back_link_url, back_history_path(default: assessor_interface_application_form_path(@application_form)) %>
@@ -30,17 +31,19 @@
3031
"Does the response confirm that the qualification is valid?" %>
3132

3233
<%= f.govuk_radio_buttons_fieldset :passed, legend: { text: legend } do %>
33-
<%= f.govuk_radio_button :passed, :true, link_errors: true %>
34+
<%= f.govuk_radio_button :passed, :true, link_errors: true, disabled: !can_update_verify_qualification_request %>
3435

3536
<% if @qualification_request.expired? %>
36-
<%= f.govuk_radio_button :passed, :false do %>
37-
<%= f.govuk_radio_button :received, :true %>
38-
<%= f.govuk_radio_button :received, :false %>
37+
<%= f.govuk_radio_button :passed, :false, disabled: !can_update_verify_qualification_request do %>
38+
<%= f.govuk_radio_button :received, :true, disabled: !can_update_verify_qualification_request %>
39+
<%= f.govuk_radio_button :received, :false, disabled: !can_update_verify_qualification_request %>
3940
<% end %>
4041
<% else %>
41-
<%= f.govuk_radio_button :passed, :false %>
42+
<%= f.govuk_radio_button :passed, :false, disabled: !can_update_verify_qualification_request %>
4243
<% end %>
4344
<% end %>
4445

45-
<%= render "shared/assessor_interface/continue_cancel_button", f: %>
46+
<%= f.govuk_submit disabled: !can_update_verify_qualification_request do %>
47+
<%= render "shared/assessor_interface/cancel_link" %>
48+
<% end %>
4649
<% end %>

0 commit comments

Comments
 (0)