aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2012-08-17 09:59:12 +0100
committerMatthew Somerville <matthew@mysociety.org>2012-08-17 10:35:26 +0100
commitf38249abbe721f33b46cd83e6c61de63dd0ab766 (patch)
tree989a5b94f30f60537c60f889cb041972c0c62ca0
parent5adab230b81a635c578977fb96ded280ea9f4bdf (diff)
Allow reports_per_page to be specified in config file,
-rw-r--r--conf/general.yml-example16
-rw-r--r--perllib/FixMyStreet/Cobrand/Default.pm2
2 files changed, 10 insertions, 8 deletions
diff --git a/conf/general.yml-example b/conf/general.yml-example
index 124472a36..1fe2b8467 100644
--- a/conf/general.yml-example
+++ b/conf/general.yml-example
@@ -95,10 +95,6 @@ GEOCODING_DISAMBIGUATION: ''
# FixMyStreet.
MAP_TYPE: 'OSM'
-# If you wish to send email through a SMTP server elsewhere, change this
-# variable.
-SMTP_SMARTHOST: 'localhost'
-
# FixMyStreet uses a templating cobrand system to provide different looks for
# different installations. If your site was at moon.example.org, and your templates
# were in the templates/web/moon directory, you would use:
@@ -114,13 +110,19 @@ ALLOWED_COBRANDS:
# the admin interface. If wanted, set to the full URL of your admin interface.
ADMIN_BASE_URL: ''
+# How many items are returned in the GeoRSS feeds by default
+RSS_LIMIT: '20'
+# How many reports to show per page on the All Reports pages
+ALL_REPORTS_PER_PAGE: 100
+
+# If you wish to send email through a SMTP server elsewhere, change this
+# variable.
+SMTP_SMARTHOST: 'localhost'
+
# Gaze is a world-wide service for population density lookups. You can leave
# this as is.
GAZE_URL: 'http://gaze.mysociety.org/gaze'
-# How many items are returned in the GeoRSS feeds by default
-RSS_LIMIT: '20'
-
# Should problem reports link to the council summary pages?
AREA_LINKS_FROM_PROBLEMS: '0'
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index 1d596fb43..04265963a 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -320,7 +320,7 @@ The number of reports to show per page on all reports page.
=cut
sub reports_per_page {
- return 100;
+ return FixMyStreet->config('ALL_REPORTS_PER_PAGE') || 100;
}
=head2 on_map_list_limit