From 6d934dd4475a7beeef9b7c547f27688ea6f94438 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Fri, 15 Oct 2010 21:24:36 -0400 Subject: made pinging google conditional on setting sitemap code and made comment maximum length adjustible --- askbot/conf/forum_data_rules.py | 11 +++++++++++ askbot/models/base.py | 4 +++- askbot/models/question.py | 4 +++- askbot/skins/default/media/js/com.cnprog.post.js | 15 ++++++++++++--- askbot/skins/default/templates/question.html | 5 +++-- 5 files changed, 32 insertions(+), 7 deletions(-) diff --git a/askbot/conf/forum_data_rules.py b/askbot/conf/forum_data_rules.py index 68025f48..dd740487 100644 --- a/askbot/conf/forum_data_rules.py +++ b/askbot/conf/forum_data_rules.py @@ -30,6 +30,17 @@ settings.register( ) ) +settings.register( + IntegerValue( + FORUM_DATA_RULES, + 'MAX_COMMENT_LENGTH', + default=300, + description=_( + 'Maximum comment length, must be < %(max_len)s' + ) % {'max_len': const.COMMENT_HARD_MAX_LENGTH } + ) +) + settings.register( IntegerValue( FORUM_DATA_RULES, diff --git a/askbot/models/base.py b/askbot/models/base.py index f81d6172..7adad057 100644 --- a/askbot/models/base.py +++ b/askbot/models/base.py @@ -151,7 +151,9 @@ def parse_and_save_post(post, author = None, **kwargs): ) try: - ping_google() + from askbot.conf import settings as askbot_settings + if askbot_settings.GOOGLE_SITEMAP_CODE != '': + ping_google() except Exception: logging.debug('cannot ping google - did you register with them?') diff --git a/askbot/models/question.py b/askbot/models/question.py index c13985c0..76edce91 100644 --- a/askbot/models/question.py +++ b/askbot/models/question.py @@ -404,7 +404,9 @@ class Question(content.Content, DeletableContent): def delete(self): super(Question, self).delete() try: - ping_google() + from askbot.conf import settings as askbot_settings + if askbot_settings.GOOGLE_SITEMAP_CODE != '': + ping_google() except Exception: logging.debug('problem pinging google did you register you sitemap with google?') diff --git a/askbot/skins/default/media/js/com.cnprog.post.js b/askbot/skins/default/media/js/com.cnprog.post.js index e03053ab..4512132d 100755 --- a/askbot/skins/default/media/js/com.cnprog.post.js +++ b/askbot/skins/default/media/js/com.cnprog.post.js @@ -519,7 +519,8 @@ function createComments(type) { if (canPostComments(id)) { if (jDiv.find("#" + formId).length === 0) { var form = '
'; - form += '