Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't rewrite url schema for datapackage-url #21

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+6 −7
Open

Don't rewrite url schema for datapackage-url #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85721f5
Don't open Edit and View in new tabs
brew May 4, 2018
102ef1c
Don't rewrite schema of origin url
brew May 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/scripts/directives/user-datasets/template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@
</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)"
><svg><use xlink:href="#icon-trashcan" /></svg><span>Delete</span></a>
</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">
Expand Down
1 change: 0 additions & 1 deletion app/scripts/services/os-admin/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions tests/data/loaded-packages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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'
}
]
Expand All @@ -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,
Expand All @@ -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'
}
]
Expand Down