From e8c7b41e6da34d655c98cfc18a9024dd23b3ee39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Sat, 2 Jan 2016 13:42:57 +0100 Subject: [PATCH] Configuration: settings to configure count of showcased maps - UMAP_MAPS_PER_PAGE - UMAP_MAPS_PER_PAGE_OWNER --- umap/settings/base.py | 2 ++ umap/settings/local.py.sample | 5 +++++ umap/views.py | 7 +++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/umap/settings/base.py b/umap/settings/base.py index 3bb20b7c..6f08f060 100644 --- a/umap/settings/base.py +++ b/umap/settings/base.py @@ -148,6 +148,8 @@ LEAFLET_STORAGE_EXTRA_URLS = { SITE_URL = "http://umap.org" UMAP_DEMO_SITE = False UMAP_EXCLUDE_DEFAULT_MAPS = False +UMAP_MAPS_PER_PAGE = 5 +UMAP_MAPS_PER_PAGE_OWNER = 10 MAP_SHORT_URL_NAME = "umap_short_url" UMAP_USE_UNACCENT = False UMAP_FEEDBACK_LINK = "http://wiki.openstreetmap.org/wiki/UMap#Feedback_and_help" # noqa diff --git a/umap/settings/local.py.sample b/umap/settings/local.py.sample index fce8e8d7..f65e4993 100644 --- a/umap/settings/local.py.sample +++ b/umap/settings/local.py.sample @@ -69,6 +69,11 @@ UMAP_DEMO_SITE = True # the default center has not been updated) UMAP_EXCLUDE_DEFAULT_MAPS = False +# How many maps should be showcased on the main page resp. on the user page +UMAP_MAPS_PER_PAGE = 5 +# How many maps should be showcased on the user page, if owner +UMAP_MAPS_PER_PAGE_OWNER = 10 + SITE_URL = "http://localhost:8019" SHORT_SITE_URL = "http://s.hort" diff --git a/umap/views.py b/umap/views.py index 93fe7e08..397874fc 100644 --- a/umap/views.py +++ b/umap/views.py @@ -75,7 +75,7 @@ class Home(TemplateView, PaginatorMixin): else: qs = qs.exclude(id=showcase_map.pk) maps = qs.order_by('-modified_at')[:50] - maps = self.paginate(maps) + maps = self.paginate(maps, settings.UMAP_MAPS_PER_PAGE) return { "maps": maps, @@ -115,7 +115,10 @@ class UserMaps(DetailView, PaginatorMixin): manager = Map.objects if owner else Map.public maps = manager.filter(Q(owner=self.object) | Q(editors=self.object)) maps = maps.distinct().order_by('-modified_at')[:50] - per_page = 10 if owner else self.per_page + if owner: + per_page = settings.UMAP_MAPS_PER_PAGE_OWNER + else: + per_page = settings.UMAP_MAPS_PER_PAGE maps = self.paginate(maps, per_page) kwargs.update({ "maps": maps