From 85721f57aacd5457e2df0124dbb79931456c66e6 Mon Sep 17 00:00:00 2001
From: Brook Elgie <specialbrew@gmail.com>
Date: Fri, 4 May 2018 11:59:58 +0100
Subject: [PATCH 1/2] Don't open Edit and View in new tabs

---
 app/scripts/directives/user-datasets/template.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/scripts/directives/user-datasets/template.html b/app/scripts/directives/user-datasets/template.html
index 493bef3..d7cde51 100644
--- a/app/scripts/directives/user-datasets/template.html
+++ b/app/scripts/directives/user-datasets/template.html
@@ -63,7 +63,7 @@
           </li>
           <li class="edit" ng-if="!!packagerUrl">
             <a data-toggle="tooltip" bootstrap-tooltip data-placement="top" title="Edit"
-               ng-href="{{ packagerUrl + '/provide-data/?package=' + package.url }}" target="_blank"><svg><use xlink:href="#icon-edit" /></svg><span>Edit</span></a>
+               ng-href="{{ packagerUrl + '/provide-data/?package=' + package.url }}"><svg><use xlink:href="#icon-edit" /></svg><span>Edit</span></a>
           </li>
           <li class="delete" ng-if="!!packagerUrl">
             <a data-toggle="popover" confirmation-popover data-on-click="deletePackage(package.id)"
@@ -71,7 +71,7 @@
           </li>
           <li class="view" ng-if="!!viewerUrl && package.loadingStatus.loaded">
             <a data-toggle="tooltip" bootstrap-tooltip data-placement="top" title="View"
-              ng-href="{{ viewerUrl + '/' + package.id }}" target="_blank"><svg><use xlink:href="#icon-open" /></svg><span>View</span></a>
+              ng-href="{{ viewerUrl + '/' + package.id }}"><svg><use xlink:href="#icon-open" /></svg><span>View</span></a>
           </li>
           <li class="download context" ng-init="dropdown.isDownloadVisible = false">
             <a data-toggle="tooltip" bootstrap-tooltip ng-click="dropdown.isDownloadVisible = !dropdown.isDownloadVisible" data-placement="top" title="Download">

From 102ef1c0d4d2f589032b093b09cb3b16b5d09b10 Mon Sep 17 00:00:00 2001
From: Brook Elgie <specialbrew@gmail.com>
Date: Fri, 4 May 2018 12:10:29 +0100
Subject: [PATCH 2/2] Don't rewrite schema of origin url

---
 app/scripts/services/os-admin/index.js | 1 -
 tests/data/loaded-packages.js          | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/scripts/services/os-admin/index.js b/app/scripts/services/os-admin/index.js
index 4c0c35f..c540afa 100644
--- a/app/scripts/services/os-admin/index.js
+++ b/app/scripts/services/os-admin/index.js
@@ -66,7 +66,6 @@ function getDataPackageMetadata(dataPackage) {
     dataPackage.package.name,
     'datapackage.json'
   ].join('/');
-  originUrl = originUrl.replace(/^http:/, 'https:');
 
   var totalCountOfRecords = (function(dataPackage) {
     var result = 0;
diff --git a/tests/data/loaded-packages.js b/tests/data/loaded-packages.js
index ec9bd01..7d2c77c 100644
--- a/tests/data/loaded-packages.js
+++ b/tests/data/loaded-packages.js
@@ -10,7 +10,7 @@ module.exports = [
     isPublished: true,
     last_update: 0,
     author: 'Levko Kravets',
-    url: 'https://s3.amazonaws.com/datastore.openspending.org/' +
+    url: 'http://s3.amazonaws.com/datastore.openspending.org/' +
       '583b10ad15f2e7f078afd3431c2c09ea/test/datapackage.json',
     totalCountOfResources: 1,
     totalCountOfRecords: 0,
@@ -28,7 +28,7 @@ module.exports = [
     resources: [
       {
         name: 'boost-moldova-all',
-        url: 'https://s3.amazonaws.com/datastore.openspending.org/' +
+        url: 'http://s3.amazonaws.com/datastore.openspending.org/' +
           '583b10ad15f2e7f078afd3431c2c09ea/test/boost-moldova-all.csv'
       }
     ]
@@ -42,7 +42,7 @@ module.exports = [
     isPublished: true,
     last_update: 0,
     author: 'Levko Kravets',
-    url: 'https://s3.amazonaws.com/datastore.openspending.org/' +
+    url: 'http://s3.amazonaws.com/datastore.openspending.org/' +
       '583b10ad15f2e7f078afd3431c2c09ea/test2/datapackage.json',
     totalCountOfResources: 1,
     totalCountOfRecords: 0,
@@ -60,7 +60,7 @@ module.exports = [
     resources: [
       {
         name: 'test',
-        url: 'https://s3.amazonaws.com/datastore.openspending.org/' +
+        url: 'http://s3.amazonaws.com/datastore.openspending.org/' +
           '583b10ad15f2e7f078afd3431c2c09ea/test2/test.csv'
       }
     ]