Skip to content

Commit

Permalink
clean up import
Browse files Browse the repository at this point in the history
  • Loading branch information
domoritz committed Nov 25, 2012
1 parent c3986a1 commit fef11b9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
7 changes: 3 additions & 4 deletions ckanext/jsonpreview/plugin.py
Expand Up @@ -2,7 +2,6 @@
from logging import getLogger

import ckan.plugins as p
import ckan.plugins.toolkit as toolkit
import ckan.lib.base as base

log = getLogger(__name__)
Expand Down Expand Up @@ -32,9 +31,9 @@ def update_config(self, config):
''' Set up the resource library, public directory and
template directory for the preview
'''
toolkit.add_public_directory(config, 'theme/public')
toolkit.add_template_directory(config, 'theme/templates')
toolkit.add_resource('theme/public', 'ckanext-jsonpreview')
p.toolkit.add_public_directory(config, 'theme/public')
p.toolkit.add_template_directory(config, 'theme/templates')
p.toolkit.add_resource('theme/public', 'ckanext-jsonpreview')

def proxy_enabled(self):
return pylons.config.get('ckan.resource_proxy_enabled', False)
Expand Down
7 changes: 3 additions & 4 deletions ckanext/pdfpreview/plugin.py
@@ -1,7 +1,6 @@
from logging import getLogger

import ckan.plugins as p
import ckan.plugins.toolkit as toolkit
import ckan.lib.base as base

log = getLogger(__name__)
Expand Down Expand Up @@ -30,9 +29,9 @@ def update_config(self, config):
''' Set up the resource library, public directory and
template directory for the preview
'''
toolkit.add_public_directory(config, 'theme/public')
toolkit.add_template_directory(config, 'theme/templates')
toolkit.add_resource('theme/public', 'ckanext-pdfpreview')
p.toolkit.add_public_directory(config, 'theme/public')
p.toolkit.add_template_directory(config, 'theme/templates')
p.toolkit.add_resource('theme/public', 'ckanext-pdfpreview')

def can_preview(self, data_dict):
resource = data_dict['resource']
Expand Down

0 comments on commit fef11b9

Please sign in to comment.