From 00d1ae66e1524a2e56294a2d36895f584e7cc8a0 Mon Sep 17 00:00:00 2001 From: kamidev Date: Tue, 21 Jun 2011 11:45:08 +0200 Subject: [PATCH 1/5] One more regex for the road... --- fst_web/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fst_web/urls.py b/fst_web/urls.py index bb2660c..f19ada0 100644 --- a/fst_web/urls.py +++ b/fst_web/urls.py @@ -18,7 +18,7 @@ (r'^static/(?P.*)$', 'django.views.static.serve', {'document_root': os.path.join(os.path.dirname(__file__), 'static').replace('\\','/')}), # Get files from server - (r'^/dokument/(?P.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT.replace('\\','/')}), + (r'^[|\w|-]+/dokument/(?P.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT.replace('\\','/')}), # Display start page ("/") (r'^$', 'fst_web.fs_doc.views.index'), From 487affe425655a1c49f507fe3ed19433e986da15 Mon Sep 17 00:00:00 2001 From: Staffan Malmgren Date: Tue, 21 Jun 2011 11:59:25 +0200 Subject: [PATCH 2/5] fix for loading adminplus module under wsgi --- fst.wsgi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fst.wsgi b/fst.wsgi index 9dfae24..cb9938b 100644 --- a/fst.wsgi +++ b/fst.wsgi @@ -11,6 +11,10 @@ path = os.path.dirname(__file__) if path not in sys.path: sys.path.append(path) +subpath = path + os.sep + "fst_web" +if subpath not in sys.path: + sys.path.append(subpath) + os.environ['DJANGO_SETTINGS_MODULE'] = 'fst_web.settings' import django.core.handlers.wsgi From 84286893376a3d897a134a4ea460f1ff433fbf27 Mon Sep 17 00:00:00 2001 From: kamidev Date: Tue, 21 Jun 2011 12:05:58 +0200 Subject: [PATCH 3/5] Temporarily remove view with incorrect hyperlinks --- fst_web/fs_doc/admin.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/fst_web/fs_doc/admin.py b/fst_web/fs_doc/admin.py index e846f5b..de2b265 100644 --- a/fst_web/fs_doc/admin.py +++ b/fst_web/fs_doc/admin.py @@ -375,9 +375,9 @@ def beslutsdatum(request): """ f_list = list(Myndighetsforeskrift.objects.all().order_by( - "-beslutsdatum")[:10]) + "-beslutsdatum")[:15]) a_list = list(AllmannaRad.objects.all().order_by( - "-beslutsdatum")[:10]) + "-beslutsdatum")[:15]) latest_documents = sorted( chain(f_list, a_list), key=attrgetter('beslutsdatum'), @@ -387,13 +387,16 @@ def beslutsdatum(request): admin.site.register_view( 'beslutsdatum', beslutsdatum, - u'Lista föreskrifter och allmänna råd (per beslutsdatum)') + u'Lista de 30 senaste beslutade dokumenten') admin.site.register_view( 'artal', artal, - u'Lista föreskrifter och allmänna råd (per årtal)') -admin.site.register_view( - 'amnesord', amnesord, - u'Lista föreskrifter och allmänna råd (per ämnesord)') + u'Lista samtliga föreskrifter och allmänna råd (per årtal)') + +# TODO - Fix this view so get_admin_url doesn't get called with FSDokument +# instead of Myndighetsforeskrift or AllmannaRad +#admin.site.register_view( +# 'amnesord', amnesord, +# u'Lista föreskrifter och allmänna råd (per ämnesord)') admin.site.register(AllmannaRad, AllmannaRadAdmin) admin.site.register(Myndighetsforeskrift, MyndighetsforeskriftAdmin) From 2a79dfd9505b186bdc64f8ea3f069eebc49708c1 Mon Sep 17 00:00:00 2001 From: kamidev Date: Tue, 21 Jun 2011 13:16:08 +0200 Subject: [PATCH 4/5] Lower 'list_per_page' to 25. Closes #54 --- fst_web/fs_doc/admin.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fst_web/fs_doc/admin.py b/fst_web/fs_doc/admin.py index de2b265..d2f3d21 100644 --- a/fst_web/fs_doc/admin.py +++ b/fst_web/fs_doc/admin.py @@ -16,9 +16,11 @@ from adminplus import AdminSitePlus from fst_web.fs_doc.models import * + # Add admin enhancements from AdminPlus admin.site = AdminSitePlus() +LIST_PER_PAGE_COUNT = 25 # Number of documents before automatic pagination class ForfattningssamlingAdmin(admin.ModelAdmin): list_display = ('titel', 'kortnamn', 'identifierare') @@ -166,6 +168,7 @@ class AllmannaRadAdmin(FSDokumentAdminMixin, admin.ModelAdmin): inlines = [BilagaInline, OvrigtDokumentInline] readonly_fields = ('is_published', 'identifierare',) save_on_top = True + list_per_page = LIST_PER_PAGE_COUNT fieldsets = ( (None, { @@ -243,6 +246,7 @@ class MyndighetsforeskriftAdmin(FSDokumentAdminMixin, admin.ModelAdmin): inlines = [BilagaInline, OvrigtDokumentInline] readonly_fields = ('is_published', 'identifierare',) save_on_top = True + list_per_page = LIST_PER_PAGE_COUNT fieldsets = ( (None, { @@ -315,6 +319,7 @@ class KonsolideradForeskriftAdmin(FSDokumentAdminMixin, admin.ModelAdmin): 'titel', 'konsolideringsdatum') save_on_top = True + list_per_page = LIST_PER_PAGE_COUNT exclude = ('content_md5',) def formfield_for_dbfield(self, db_field, **kwargs): From aef3908239e8222082ef258f33e6abdc68c67350 Mon Sep 17 00:00:00 2001 From: kamidev Date: Tue, 21 Jun 2011 13:47:20 +0200 Subject: [PATCH 5/5] Neverending urls.py... --- fst_web/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fst_web/urls.py b/fst_web/urls.py index f19ada0..7f433c5 100644 --- a/fst_web/urls.py +++ b/fst_web/urls.py @@ -18,7 +18,7 @@ (r'^static/(?P.*)$', 'django.views.static.serve', {'document_root': os.path.join(os.path.dirname(__file__), 'static').replace('\\','/')}), # Get files from server - (r'^[|\w|-]+/dokument/(?P.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT.replace('\\','/')}), + (r'^dokument/(?P.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT.replace('\\','/')}), # Display start page ("/") (r'^$', 'fst_web.fs_doc.views.index'),