a small change, moved setting to another chapter and renamed the setting

4 files changed, 15 insertions, 32 deletions

diff --git a/askbot/conf/spam_and_moderation.py b/askbot/conf/spam_and_moderation.py
index 6ad79130..23cb9596 100644
--- a/askbot/conf/spam_and_moderation.py
+++ b/askbot/conf/spam_and_moderation.py
@@ -11,11 +11,6 @@ SPAM_AND_MODERATION = livesettings.ConfigurationGroup(
                     super_group = EXTERNAL_SERVICES
                 )
 
-MIN_DAYS_TO_STAFF_ACCEPT_ANSWER = livesettings.ConfigurationGroup(
-                    'MIN_DAYS_TO_STAFF_ACCEPT_ANSWER',
-                    _('Answer content moderation')
-                )
-
 settings.register(
     livesettings.BooleanValue(
         SPAM_AND_MODERATION,
@@ -36,14 +31,3 @@ settings.register(
         description=_('Akismet key for spam detection')
     )
 )
-
-settings.register(
-    livesettings.IntegerValue(
-        SPAM_AND_MODERATION,
-        'MIN_DAYS_TO_STAFF_ACCEPT_ANSWER',
-        default=7,
-        description=_('Minimum days to accept an answer, '
-            'if it has not been accepted by the question poster')
-    )
-)
-
diff --git a/askbot/conf/vote_rules.py b/askbot/conf/vote_rules.py
index 5d275708..82c9b758 100644
--- a/askbot/conf/vote_rules.py
+++ b/askbot/conf/vote_rules.py
@@ -78,3 +78,13 @@ settings.register(
         description=_('Number of flags required to automatically delete posts')
     )
 )
+
+settings.register(
+    IntegerValue(
+        VOTE_RULES,
+        'MIN_DAYS_FOR_STAFF_TO_ACCEPT_ANSWER',
+        default=7,
+        description=_('Minimum days to accept an answer, '
+            'if it has not been accepted by the question poster')
+    )
+)
diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py
index 04d43c5d..5d1cd95d 100644
--- a/askbot/models/__init__.py
+++ b/askbot/models/__init__.py
@@ -345,7 +345,7 @@ def user_assert_can_unaccept_best_answer(self, answer = None):
 
     elif self.is_administrator() or self.is_moderator():
         will_be_able_at = (answer.added_at + 
-            datetime.timedelta(days=askbot_settings.MIN_DAYS_TO_STAFF_ACCEPT_ANSWER))
+            datetime.timedelta(days=askbot_settings.MIN_DAYS_FOR_STAFF_TO_ACCEPT_ANSWER))
 
         if datetime.datetime.now() < will_be_able_at:
             error_message = _(
diff --git a/askbot/tests/permission_assertion_tests.py b/askbot/tests/permission_assertion_tests.py
index 5d01767f..fc1fbcb7 100644
--- a/askbot/tests/permission_assertion_tests.py
+++ b/askbot/tests/permission_assertion_tests.py
@@ -1382,7 +1382,8 @@ class AcceptBestAnswerPermissionAssertionTests(utils.AskbotTestCase):
     def test_moderator_can_accept_others_old_answer(self):
         self.other_post_answer()
         self.answer.added_at -= datetime.timedelta(
-            days=askbot_settings.MIN_DAYS_TO_STAFF_ACCEPT_ANSWER+1)
+            days = askbot_settings.MIN_DAYS_FOR_STAFF_TO_ACCEPT_ANSWER + 1
+        )
         self.answer.save()
         self.create_user(username = 'third_user')
         self.third_user.set_admin_status()
@@ -1405,7 +1406,8 @@ class AcceptBestAnswerPermissionAssertionTests(utils.AskbotTestCase):
     def test_admin_can_accept_others_old_answer(self):
         self.other_post_answer()
         self.answer.added_at -= datetime.timedelta(
-            days=askbot_settings.MIN_DAYS_TO_STAFF_ACCEPT_ANSWER+1)
+            days = askbot_settings.MIN_DAYS_FOR_STAFF_TO_ACCEPT_ANSWER + 1
+        )
         self.answer.save()
         self.create_user(username = 'third_user')
         self.third_user.set_admin_status()
@@ -1421,19 +1423,6 @@ class VotePermissionAssertionTests(PermissionAssertionTestCase):
         self.other_user = self.create_other_user()
 
     def assert_cannot_vote(self, user = None, dir = None):
-        self.create_user(username = 'third_user')
-        self.third_user.set_status('m')
-        self.assert_user_can(user = self.third_user)
-
-class VotePermissionAssertionTests(PermissionAssertionTestCase):
-    """Tests permission for voting
-    """
-    def extraSetUp(self):
-        self.min_rep_up = askbot_settings.MIN_REP_TO_VOTE_UP
-        self.min_rep_down = askbot_settings.MIN_REP_TO_VOTE_DOWN
-        self.other_user = self.create_other_user()
-
-    def assert_cannot_vote(self, user = None, dir = None):
         assert(dir in ('up', 'down'))
 
         vote_func = self.get_vote_function(