baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

CLDC-3280: Hide upload button if navigating from a view url

CLDC-3280-update-error-report-upload-again-button-if-just-viewing
samyou-softwire 3 weeks ago
parent
fb5568e5eb
commit
cd2dd504b8
6 changed files with 16 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      app/models/forms/bulk_upload_resume/confirm.rb
  2. 4
      app/models/forms/bulk_upload_resume/fix_choice.rb
  3. 4
      app/views/bulk_upload_lettings_results/show.html.erb
  4. 4
      app/views/bulk_upload_lettings_results/summary.html.erb
  5. 4
      app/views/bulk_upload_sales_results/show.html.erb
  6. 4
      app/views/bulk_upload_sales_results/summary.html.erb

4
app/models/forms/bulk_upload_resume/confirm.rb
Unescape View File

@ -22,9 +22,9 @@ module Forms
def error_report_path
if BulkUploadErrorSummaryTableComponent.new(bulk_upload:).errors?
send("summary_bulk_upload_#{log_type}_result_path", bulk_upload)
send("summary_bulk_upload_#{log_type}_result_path", bulk_upload, hide_upload_button: "true")
else
send("bulk_upload_#{log_type}_result_path", bulk_upload)
send("bulk_upload_#{log_type}_result_path", bulk_upload, hide_upload_button: "true")
end
end

4
app/models/forms/bulk_upload_resume/fix_choice.rb
Unescape View File

@ -36,9 +36,9 @@ module Forms
def error_report_path
if BulkUploadErrorSummaryTableComponent.new(bulk_upload:).errors?
send("summary_bulk_upload_#{log_type}_result_path", bulk_upload)
send("summary_bulk_upload_#{log_type}_result_path", bulk_upload, hide_upload_button: "true")
else
send("bulk_upload_#{log_type}_result_path", bulk_upload)
send("bulk_upload_#{log_type}_result_path", bulk_upload, hide_upload_button: "true")
end
end

4
app/views/bulk_upload_lettings_results/show.html.erb
Unescape View File

@ -33,4 +33,6 @@
</div>
</div>
<%= govuk_button_link_to "Upload your file again", start_bulk_upload_lettings_logs_path(organisation_id: @bulk_upload.organisation_id) %>
<% if params[:hide_upload_button] != "true" %>
<%= govuk_button_link_to "Upload your file again", start_bulk_upload_lettings_logs_path(organisation_id: @bulk_upload.organisation_id) %>
<% end %>

4
app/views/bulk_upload_lettings_results/summary.html.erb
Unescape View File

@ -38,4 +38,6 @@
<% end %>
</div>
<%= govuk_button_link_to "Upload your file again", start_bulk_upload_lettings_logs_path(organisation_id: @bulk_upload.organisation_id) %>
<% if params[:hide_upload_button] != "true" %>
<%= govuk_button_link_to "Upload your file again", start_bulk_upload_lettings_logs_path(organisation_id: @bulk_upload.organisation_id) %>
<% end %>

4
app/views/bulk_upload_sales_results/show.html.erb
Unescape View File

@ -33,4 +33,6 @@
</div>
</div>
<%= govuk_button_link_to "Upload your file again", start_bulk_upload_sales_logs_path(organisation_id: @bulk_upload.organisation_id) %>
<% if params[:hide_upload_button] != "true" %>
<%= govuk_button_link_to "Upload your file again", start_bulk_upload_sales_logs_path(organisation_id: @bulk_upload.organisation_id) %>
<% end %>

4
app/views/bulk_upload_sales_results/summary.html.erb
Unescape View File

@ -38,4 +38,6 @@
<% end %>
</div>
<%= govuk_button_link_to "Upload your file again", start_bulk_upload_sales_logs_path(organisation_id: @bulk_upload.organisation_id) %>
<% if params[:hide_upload_button] != "true" %>
<%= govuk_button_link_to "Upload your file again", start_bulk_upload_sales_logs_path(organisation_id: @bulk_upload.organisation_id) %>
<% end %>

Write Preview
Loading…
Cancel
Save