Fix #68: user can't download query results of a new query

This commit is contained in:
Arik Fraimovich
2017-12-06 18:14:34 +02:00
parent 271e6a56da
commit 8e668d2e09
2 changed files with 15 additions and 2 deletions

View File

@@ -13,8 +13,20 @@ function queryResultLink() {
if (scope.queryResult.getId() == null) {
element.attr('href', '');
} else {
element.attr('href', `api/queries/${scope.query.id}/results/${scope.queryResult.getId()}.${fileType}${scope.embed ? `?api_key=${scope.apiKey}` : ''}`);
element.attr('download', `${scope.query.name.replace(' ', '_') + moment(scope.queryResult.getUpdatedAt()).format('_YYYY_MM_DD')}.${fileType}`);
let url;
if (scope.query.id) {
url = `api/queries/${scope.query.id}/results/${scope.queryResult.getId()}.${fileType}${scope.embed
? `?api_key=${scope.apiKey}`
: ''}`;
} else {
url = `api/query_results/${scope.queryResult.getId()}.${fileType}`;
}
element.attr('href', url);
element.attr(
'download',
`${scope.query.name.replace(' ', '_') +
moment(scope.queryResult.getUpdatedAt()).format('_YYYY_MM_DD')}.${fileType}`,
);
}
});
},

View File

@@ -79,6 +79,7 @@ api.add_org_resource(CheckPermissionResource, '/api/<object_type>/<object_id>/ac
api.add_org_resource(QueryResultListResource, '/api/query_results', endpoint='query_results')
api.add_org_resource(QueryResultResource,
'/api/query_results/<query_result_id>.<filetype>',
'/api/query_results/<query_result_id>',
'/api/queries/<query_id>/results.<filetype>',
'/api/queries/<query_id>/results/<query_result_id>.<filetype>',