Skip to content

[#31] Fix Flask exception #32

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

Open
hayley-leblanc wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[#31] Fix Flask exception #32

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
0b8a036
Add request_type helper function
hayley-leblanc Jul 22, 2019
6284c24
Get URL based on flask vs. pylons use
hayley-leblanc Jul 22, 2019
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
7 changes: 7 additions & 0 deletions ckanext/pdfview/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@

import ckan.plugins as p
import ckan.lib.datapreview as datapreview
from ckan.common import is_flask_request

log = logging.getLogger(__name__)

def request_type():
return is_flask_request()

class PdfView(p.SingletonPlugin):
'''This extension views PDFs. '''
Expand All @@ -18,6 +21,7 @@ class PdfView(p.SingletonPlugin):
p.implements(p.IConfigurer, inherit=True)
p.implements(p.IConfigurable, inherit=True)
p.implements(p.IResourceView, inherit=True)
p.implements(p.ITemplateHelpers)

PDF = ['pdf', 'x-pdf', 'acrobat', 'vnd.pdf']
proxy_is_enabled = False
Expand Down Expand Up @@ -52,3 +56,6 @@ def can_view(self, data_dict):

def view_template(self, context, data_dict):
return 'pdf.html'

def get_helpers(self):
return {'pdfview_request_type': request_type}
46 changes: 34 additions & 12 deletions ckanext/pdfview/theme/templates/package/snippets/resource_view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,44 @@
</p>
</div>
{% if not to_preview %}
{% set current_filters = request.str_GET.get('filters') %}
{% if current_filters %}
{% set src = h.url(qualified=true, controller='package',
action='resource_view', id=package['name'],
resource_id=resource['id'],
view_id=resource_view['id'],
filters=current_filters) %}
{% set is_flask = h.pdfview_request_type() %}
{# set current_filters correctly, depending on whether we are using flask or pylons #}
{% if is_flask %}
{% set current_filters = request.args.get('filters') %}
{% if current_filters %}
{% set src = h.url(qualified=true, controller='resource',
action='view', id=package['name'],
resource_id=resource['id'],
view_id=resource_view['id'],
filters=current_filters) %}
{% else %}
{% set src = h.url(qualified=true, controller='resource',
action='view', id=package['name'],
resource_id=resource['id'],
view_id=resource_view['id']) %}
{% endif %}
{% else %}
{% set src = h.url(qualified=true, controller='package',
action='resource_view', id=package['name'],
resource_id=resource['id'],
view_id=resource_view['id']) %}
{% set current_filters = request.str_GET.get('filters') %}
{% if current_filters %}
{% set src = h.url(qualified=true, controller='package',
action='resource_view', id=package['name'],
resource_id=resource['id'],
view_id=resource_view['id'],
filters=current_filters) %}
{% else %}
{% set src = h.url(qualified=true, controller='package',
action='resource_view', id=package['name'],
resource_id=resource['id'],
view_id=resource_view['id']) %}
{% endif %}
{% endif %}
{% else %}
{# When previewing we need to stick the whole resource_view as a param as there is no other way to pass to information on to the iframe #}
{% set src = h.url(qualified=true, controller='package', action='resource_view', id=package['name'], resource_id=resource['id']) + '?' + h.urlencode({'resource_view': h.dump_json(resource_view)}) %}
{% if is_flask %}
{% set src = h.url(qualified=true, controller='resource', action='view', id=package['name'], resource_id=resource['id']) + '?' + h.urlencode({'resource_view': h.dump_json(resource_view)}) %}
{% else %}
{% set src = h.url(qualified=true, controller='package', action='resource_view', id=package['name'], resource_id=resource['id']) + '?' + h.urlencode({'resource_view': h.dump_json(resource_view)}) %}
{% endif %}
{% endif %}
<iframe src="{{ src }}" frameborder="0" width="100%" data-module="data-viewer" allowfullscreen>
<p>{{ _('Your browser does not support iframes.') }}</p>
Expand Down