diff options
| -rw-r--r-- | askbot/conf/forum_data_rules.py | 18 | ||||
| -rw-r--r-- | askbot/forms.py | 10 | ||||
| -rw-r--r-- | askbot/skins/common/media/js/post.js | 15 | ||||
| -rw-r--r-- | askbot/skins/default/templates/meta/editor_data.html | 2 |
4 files changed, 32 insertions, 13 deletions
diff --git a/askbot/conf/forum_data_rules.py b/askbot/conf/forum_data_rules.py index 80af2f5b..a875092e 100644 --- a/askbot/conf/forum_data_rules.py +++ b/askbot/conf/forum_data_rules.py @@ -89,6 +89,24 @@ settings.register( ) settings.register( + livesettings.IntegerValue( + FORUM_DATA_RULES, + 'MIN_TITLE_LENGTH', + default=10, + description=_('Minimum length of title (number of characters)') + ) +) + +settings.register( + livesettings.IntegerValue( + FORUM_DATA_RULES, + 'MIN_EDITOR_LENGTH', + default=10, + description=_('Minimum length of question content (number of characters)') + ) +) + +settings.register( livesettings.StringValue( FORUM_DATA_RULES, 'MANDATORY_TAGS', diff --git a/askbot/forms.py b/askbot/forms.py index d2215189..e880d4a7 100644 --- a/askbot/forms.py +++ b/askbot/forms.py @@ -106,8 +106,9 @@ class TitleField(forms.CharField): self.initial = '' def clean(self, value): - if len(value) < 10: - raise forms.ValidationError(_('title must be > 10 characters')) + if len(value) < askbot_settings.MIN_TITLE_LENGTH: + msg = _('title must be > %d characters') % askbot_settings.MIN_TITLE_LENGTH + raise forms.ValidationError(msg) return value @@ -121,8 +122,9 @@ class EditorField(forms.CharField): self.initial = '' def clean(self, value): - if len(value) < 10: - raise forms.ValidationError(_('question content must be > 10 characters')) + if len(value) < askbot_settings.MIN_EDITOR_LENGTH: + msg = _('question content must be > %d characters') % askbot_settings.MIN_EDITOR_LENGTH + raise forms.ValidationError(msg) return value class TagNamesField(forms.CharField): diff --git a/askbot/skins/common/media/js/post.js b/askbot/skins/common/media/js/post.js index 22e2b6c4..9939537b 100644 --- a/askbot/skins/common/media/js/post.js +++ b/askbot/skins/common/media/js/post.js @@ -112,17 +112,14 @@ var CPValidator = function(){ limit_tag_length: true }, text: { - required: true, - minlength: 10 + minlength: askbot['settings']['minEditorLength'] + }, + title: { + minlength: askbot['settings']['minTitleLength'] } - /*title: { - required: true, - minlength: 10 - }*/ }; }, getQuestionFormMessages: function(){ - var chars = 10 return { tags: { required: " " + gettext('tags cannot be empty'), @@ -132,11 +129,11 @@ var CPValidator = function(){ }, text: { required: " " + gettext('content cannot be empty'), - minlength: interpolate(gettext('%s content minchars'), [chars]) + minlength: interpolate(gettext('%s content minchars'), [askbot['settings']['minEditorLength']]) }, title: { required: " " + gettext('please enter title'), - minlength: interpolate(gettext('%s title minchars'), [chars]) + minlength: interpolate(gettext('%s title minchars'), [askbot['settings']['minTitleLength']]) } }; } diff --git a/askbot/skins/default/templates/meta/editor_data.html b/askbot/skins/default/templates/meta/editor_data.html index 79ed96fb..7902fe8e 100644 --- a/askbot/skins/default/templates/meta/editor_data.html +++ b/askbot/skins/default/templates/meta/editor_data.html @@ -7,4 +7,6 @@ askbot['messages']['maxTagsPerPost'] = '{% trans tag_count = settings.MAX_TAGS_PER_POST %}please use {{tag_count}} tag{% pluralize %}please use {{tag_count}} tags or less{% endtrans %}'; askbot['messages']['tagLimits'] = '{% trans tag_count=settings.MAX_TAGS_PER_POST, max_chars=settings.MAX_TAG_LENGTH %}please use up to {{tag_count}} tags, less than {{max_chars}} characters each{% endtrans %}'; askbot['urls']['upload'] = '{% url "upload" %}'; + askbot['settings']['minTitleLength'] = {{settings.MIN_TITLE_LENGTH}} + askbot['settings']['minEditorLength'] = {{settings.MIN_EDITOR_LENGTH}} </script> |