improved tag validation messages and fixed bug where tags were lost in the input box on edit

2 files changed, 13 insertions, 0 deletions

diff --git a/askbot/utils/decorators.py b/askbot/utils/decorators.py
index 0042df8f..da1cd7db 100644
--- a/askbot/utils/decorators.py
+++ b/askbot/utils/decorators.py
@@ -87,6 +87,7 @@ def ajax_only(view_func):
             if data is None:
                 data = {}
         except Exception, e:
+            #todo: also check field called "message"
             if hasattr(e, 'messages'):
                 if len(e.messages) > 1:
                     message = u'<ul>' + \
diff --git a/askbot/utils/forms.py b/askbot/utils/forms.py
index 6c3af066..6f57f71f 100644
--- a/askbot/utils/forms.py
+++ b/askbot/utils/forms.py
@@ -47,6 +47,18 @@ def get_db_object_or_404(params):
         #need catch-all b/c of the nature of the function
         raise Http404
 
+def format_errors(error_list):
+    """If there is only one error - returns a string
+    corresponding to that error, to remove the <ul> tag.
+
+    If there is > 1 error - then convert the error_list into
+    a string.
+    """
+    if len(error_list) == 1:
+        return unicode(error_list[0])
+    else:
+        return unicode(error_list)
+
 class StrippedNonEmptyCharField(forms.CharField):
     def clean(self, value):
         value = value.strip()