embee/django-pdfformfiller
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixing STATIC_FORMS_ROOT search path

Browse source
This commit is contained in:
Mark Riedesel 2013-11-10 20:31:21 -06:00
parent 440163e504
commit 77713d81b0
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
admin.py
View file

@ -21,7 +21,8 @@ class PageAdmin(admin.ModelAdmin):
def get_urls(self): def get_urls(self):
urls = super(PageAdmin, self).get_urls() urls = super(PageAdmin, self).get_urls()
my_urls = patterns('', my_urls = patterns('',
url(r'^(?P<pk>.*)/preview/$', self.admin_site.admin_view(self.preview), name='preview') url(r'^(?P<pk>.*)/preview/$', self.admin_site.admin_view(self.preview), name='preview'),
url(r'^(?P<pk>.*)/json/$', self.admin_site.admin_view(self.json, name='json'),
) )
return my_urls + urls return my_urls + urls
@ -35,6 +36,11 @@ class PageAdmin(admin.ModelAdmin):
context 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): class FormFieldAdmin(admin.ModelAdmin):
list_display = ['name', 'page', 'fieldtype', 'page_number', 'pos_y'] list_display = ['name', 'page', 'fieldtype', 'page_number', 'pos_y']

2
controller.py
View file

@ -15,7 +15,7 @@ class PopplerController(object):
search = [ search = [
os.path.abspath(pdf), 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: for path in search:

2
views/editor.py
View file

@ -18,7 +18,7 @@ class PDFFormFillerEditor(View):
def load_poppler_doc(self, filename): def load_poppler_doc(self, filename):
from django.conf import settings 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): if os.path.isfile(pdf_path):
return poppler.document_new_from_file('file://' + pdf_path, password=None) return poppler.document_new_from_file('file://' + pdf_path, password=None)