summaryrefslogtreecommitdiffstats
path: root/askbot/conf
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2013-08-15 04:48:17 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2013-08-15 04:48:17 -0400
commitf4fa9b394bd3d6bdd9d64ed9d815fa0d43911fe8 (patch)
tree2e5a047df57e5fa7352fe2f6e819cd63931be7bd /askbot/conf
parentf84c404b06ad5c3a6ef7c7cbe9c7c3c9dbef03d7 (diff)
parentd221c840fc25b06c4dc0ebe50b94a1d93e1442ad (diff)
downloadaskbot-f4fa9b394bd3d6bdd9d64ed9d815fa0d43911fe8.tar.gz
askbot-f4fa9b394bd3d6bdd9d64ed9d815fa0d43911fe8.tar.bz2
askbot-f4fa9b394bd3d6bdd9d64ed9d815fa0d43911fe8.zip
Merge branch 'master' into user-questions-pagination
Diffstat (limited to 'askbot/conf')
-rw-r--r--askbot/conf/forum_data_rules.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/askbot/conf/forum_data_rules.py b/askbot/conf/forum_data_rules.py
index f32f34bf..caa93563 100644
--- a/askbot/conf/forum_data_rules.py
+++ b/askbot/conf/forum_data_rules.py
@@ -225,6 +225,16 @@ settings.register(
)
settings.register(
+ livesettings.StringValue(
+ FORUM_DATA_RULES,
+ 'DEFAULT_ANSWER_SORT_METHOD',
+ default=const.DEFAULT_ANSWER_SORT_METHOD,
+ choices=const.ANSWER_SORT_METHODS,
+ description=_('How to sort answers by default')
+ )
+)
+
+settings.register(
livesettings.BooleanValue(
FORUM_DATA_RULES,
'TAGS_ARE_REQUIRED',