Merge pull request #3724 from alphagov/remove-duplicate-licence-code

Remove duplicate licence rendering code
alphagov · Aug 15, 2023 · 25e9f4f · 25e9f4f
2 parents b6f5c48 + 7f2a934
commit 25e9f4f
Show file tree

Hide file tree

Showing 18 changed files with 15 additions and 2,154 deletions.
diff --git a/README.md b/README.md
@@ -30,18 +30,18 @@ Transaction start pages:
 
 ### Licence finders
 
-* https://www.gov.uk/premises-licence
-* https://www.gov.uk/temporary-events-notice
-* https://www.gov.uk/apply-skip-permit
-* https://www.gov.uk/street-collection-licence
-* https://www.gov.uk/zoo-licence
-* https://www.gov.uk/premises-licence-scotland
-* https://www.gov.uk/house-to-house-collection-licence
-* https://www.gov.uk/public-charitable-collection-permit-scotland
-* https://www.gov.uk/late-hours-catering-licence-scotland
-* https://www.gov.uk/food-business-registration
-* https://www.gov.uk/cooling-tower-notification
-* https://www.gov.uk/performing-animals-registration
+* https://www.gov.uk/find-licences/premises-licence
+* https://www.gov.uk/find-licences/temporary-events-notice
+* https://www.gov.uk/find-licences/apply-skip-permit
+* https://www.gov.uk/find-licences/street-collection-licence
+* https://www.gov.uk/find-licences/zoo-licence
+* https://www.gov.uk/find-licences/premises-licence-scotland
+* https://www.gov.uk/find-licences/house-to-house-collection-licence
+* https://www.gov.uk/find-licences/public-charitable-collection-permit-scotland
+* https://www.gov.uk/find-licences/late-hours-catering-licence-scotland
+* https://www.gov.uk/find-licences/food-business-registration
+* https://www.gov.uk/find-licences/cooling-tower-notification
+* https://www.gov.uk/find-licences/performing-animals-registration
 
 ### Calendars
 

diff --git a/app/controllers/development_controller.rb b/app/controllers/development_controller.rb
@@ -2,16 +2,6 @@ class DevelopmentController < ApplicationController
   layout false
 
   def index
-    @schema_names = %w[
-      calendar
-      homepage
-      local_transaction
-      place
-      simple_smart_answer
-      transaction
-      travel_advice
-    ]
-
     @paths = YAML.load_file(Rails.root.join("config/govuk_examples.yml"))
   end
 end
diff --git a/app/controllers/licence_controller.rb b/app/controllers/licence_controller.rb
diff --git a/app/controllers/licence_transaction_controller.rb b/app/controllers/licence_transaction_controller.rb
@@ -29,8 +29,8 @@ def find
 
     @addresses = address_list
     @options = options
-    @change_path = licence_path(slug: params[:slug])
-    @onward_path = licence_multiple_authorities_path(slug: params[:slug])
+    @change_path = licence_transaction_path(slug: params[:slug])
+    @onward_path = licence_transaction_multiple_authorities_path(slug: params[:slug])
     render :multiple_authorities
   end
 

diff --git a/app/presenters/licence_presenter.rb b/app/presenters/licence_presenter.rb
diff --git a/app/views/licence/_action.html.erb b/app/views/licence/_action.html.erb
diff --git a/app/views/licence/_authority_details.html.erb b/app/views/licence/_authority_details.html.erb
diff --git a/app/views/licence/_authority_url.html.erb b/app/views/licence/_authority_url.html.erb
diff --git a/app/views/licence/_licensify_unavailable.html.erb b/app/views/licence/_licensify_unavailable.html.erb
diff --git a/app/views/licence/authority.html.erb b/app/views/licence/authority.html.erb