improved configuration parameters for the group_messaging app

3 files changed, 13 insertions, 7 deletions

diff --git a/askbot/deps/group_messaging/models.py b/askbot/deps/group_messaging/models.py
index 5d43baf8..4442170f 100644
--- a/askbot/deps/group_messaging/models.py
+++ b/askbot/deps/group_messaging/models.py
@@ -333,13 +333,13 @@ class Message(models.Model):
         """returns absolute url to the thread"""
         assert(user != None)
         settings = django_settings.GROUP_MESSAGING
-        func_path = settings['base_url_getter_function']
+        func_path = settings['BASE_URL_GETTER_FUNCTION']
         path_bits = func_path.split('.')
         url_getter = getattr(
                         import_module('.'.join(path_bits[:-1])),
                         path_bits[-1]
                     )
-        params = copy.copy(settings['base_url_params'])
+        params = copy.copy(settings['BASE_URL_PARAMS'])
         params['thread_id'] = self.id
         url = url_getter(user) + '?' + urllib.urlencode(params)
         #if include_domain_name: #don't need this b/c
diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache
index 1f3dabd2..d7b455f8 100644
--- a/askbot/setup_templates/settings.py.mustache
+++ b/askbot/setup_templates/settings.py.mustache
@@ -178,6 +178,7 @@ INSTALLED_APPS = (
     'djkombu',
     'followit',
     'tinymce',
+    'group_messaging',
     #'avatar',#experimental use git clone git://github.com/ericflo/django-avatar.git$
 )
 
@@ -279,3 +280,8 @@ TINYMCE_DEFAULT_CONFIG = {
 
 #delayed notifications, time in seconds, 15 mins by default
 NOTIFICATION_DELAY_TIME = 60 * 15 
+
+GROUP_MESSAGING = {
+    'BASE_URL_GETTER_FUNCTION': 'askbot.models.user_get_profile_url',
+    'BASE_URL_PARAMS': {'section': 'messages', 'sort': 'inbox'}
+}
diff --git a/askbot/startup_procedures.py b/askbot/startup_procedures.py
index 1fa1b3e7..50f6b929 100644
--- a/askbot/startup_procedures.py
+++ b/askbot/startup_procedures.py
@@ -774,24 +774,24 @@ def test_group_messaging():
         errors.append("add to the INSTALLED_APPS:\n'group_messaging'")
 
     settings_sample = ("GROUP_MESSAGING = {\n"
-    "    'base_url_getter_function': 'askbot.models.user_get_profile_url',\n"
-    "    'base_url_params': {'section': 'messages', 'sort': 'inbox'}\n"
+    "    'BASE_URL_GETTER_FUNCTION': 'askbot.models.user_get_profile_url',\n"
+    "    'BASE_URL_PARAMS': {'section': 'messages', 'sort': 'inbox'}\n"
     "}")
 
     settings = getattr(django_settings, 'GROUP_MESSAGING', {})
     if settings:
-        url_params = settings.get('base_url_params', {})
+        url_params = settings.get('BASE_URL_PARAMS', {})
         have_wrong_params = not (
                         url_params.get('section', None) == 'messages' and \
                         url_params.get('sort', None) == 'inbox'
                     )
-        url_getter = settings.get('base_url_getter_function', None)
+        url_getter = settings.get('BASE_URL_GETTER_FUNCTION', None)
         if url_getter != 'askbot.models.user_get_profile_url' or have_wrong_params:
             errors.append(
                 "make setting 'GROUP_MESSAGING to be exactly:\n" + settings_sample
             )
             
-        url_params = settings.get('base_url_params', None)
+        url_params = settings.get('BASE_URL_PARAMS', None)
     else:
         errors.append('add this to your settings.py:\n' + settings_sample)