diff --git a/admin.py b/admin.py index b8242c7..cf3c291 100644 --- a/admin.py +++ b/admin.py @@ -21,7 +21,8 @@ class PageAdmin(admin.ModelAdmin): def get_urls(self): urls = super(PageAdmin, self).get_urls() my_urls = patterns('', - url(r'^(?P.*)/preview/$', self.admin_site.admin_view(self.preview), name='preview') + url(r'^(?P.*)/preview/$', self.admin_site.admin_view(self.preview), name='preview'), + url(r'^(?P.*)/json/$', self.admin_site.admin_view(self.json, name='json'), ) return my_urls + urls @@ -35,6 +36,11 @@ class PageAdmin(admin.ModelAdmin): context ) + def json(self, request, pk): + page = models.Page.get(pk=pk) + attribs = ['pos_x', 'pos_y', 'name', 'height', 'width', 'fieldtype', 'page'] + + class FormFieldAdmin(admin.ModelAdmin): list_display = ['name', 'page', 'fieldtype', 'page_number', 'pos_y'] diff --git a/controller.py b/controller.py index ab76be9..240f86d 100644 --- a/controller.py +++ b/controller.py @@ -15,7 +15,7 @@ class PopplerController(object): search = [ os.path.abspath(pdf), - os.path.abspath(os.path.join(settings.STATIC_FORMS_ROOT, pdf)), + os.path.abspath(os.path.join(getattr(settings, 'STATIC_FORMS_ROOT', ''), pdf)), ] for path in search: diff --git a/views/editor.py b/views/editor.py index 4ff435b..c868cf8 100644 --- a/views/editor.py +++ b/views/editor.py @@ -18,7 +18,7 @@ class PDFFormFillerEditor(View): def load_poppler_doc(self, filename): from django.conf import settings - pdf_path = os.path.abspath(os.path.join(settings.STATIC_FORMS_ROOT, filename)) + pdf_path = os.path.abspath(os.path.join(getattr(settings, 'STATIC_FORMS_ROOT', ''), filename)) if os.path.isfile(pdf_path): return poppler.document_new_from_file('file://' + pdf_path, password=None)