Merge pull request #88 from alphagov/link-to-whitehall-content-item

Link directly to content item in whitehall
alphagov · Jan 8, 2018 · fd3f1de · fd3f1de
2 parents 38621b8 + ecf4dbc
commit fd3f1de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/spec/javascripts/external_links_spec.js b/spec/javascripts/external_links_spec.js
@@ -137,14 +137,15 @@ describe("Popup.generateExternalLinks", function () {
 
   it("generates edit links for Whitehall items", function () {
     var contentItem = {
+      content_id: '4d8568c4-67f2-48da-a578-5ac6f35b69b4',
       publishing_app: 'whitehall'
     }
 
     var links = Popup.generateExternalLinks(contentItem, PROD_ENV)
 
     expect(links).toContain({
       name: 'Go to Whitehall Publisher',
-      url: 'https://whitehall-admin.publishing.service.gov.uk/'
+      url: 'https://whitehall-admin.publishing.service.gov.uk/government/admin/by-content-id/4d8568c4-67f2-48da-a578-5ac6f35b69b4'
     })
   })
 

diff --git a/src/popup/external_links.js b/src/popup/external_links.js
@@ -96,7 +96,7 @@ function generateEditLink(contentItem, env) {
   } else if (contentItem.publishing_app == 'whitehall') {
     return {
       name: 'Go to Whitehall Publisher',
-      url: env.protocol + '://whitehall-admin.' + env.serviceDomain + '/',
+      url: env.protocol + '://whitehall-admin.' + env.serviceDomain + '/government/admin/by-content-id/' + contentItem.content_id,
     }
   } else if (contentItem.document_type == 'manual') {
     return {