Merge branch 'master' of github.com:benjaoming/django-wiki

Emaratilicious · May 17, 2014 · b032b61 · b032b61
2 parents 38dc640 + 8c45335
commit b032b61
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/wiki/forms.py b/wiki/forms.py
@@ -261,6 +261,8 @@ def clean_slug(self):
         if settings.URL_CASE_SENSITIVE:
             already_existing_slug = models.URLPath.objects.filter(slug=slug, parent=self.urlpath_parent)
         else:
+            slug = slug.lower()
+            slug = slug.replace('-', '_')
             already_existing_slug = models.URLPath.objects.filter(slug__iexact=slug, parent=self.urlpath_parent)
         if already_existing_slug:
             already_urlpath = already_existing_slug[0]

diff --git a/wiki/templates/wiki/create.html b/wiki/templates/wiki/create.html
@@ -18,7 +18,7 @@
       // if downcode doesn't hit, the char will be stripped here
       s = s.replace(/[^-\w\s]/g, '');  // remove unneeded chars
       s = s.replace(/^\s+|\s+$/g, ''); // trim leading/trailing spaces
-      s = s.replace(/[-\s]+/g, '-');   // convert spaces to hyphens
+      s = s.replace(/[-\s]+/g, '_');   // convert spaces and hyphens to underscores
       s = s.toLowerCase();             // convert to lowercase
       return s.substring(0, num_chars);// trim to first num_chars chars
   }
@@ -30,10 +30,7 @@
 			  var e = $("#id_slug")[0];
 			  if(!e._changed) {
 			    slug = URLify(this.value, 50);
-			    wikislug = slug.replace(/\-/g, " ");
-			    wikislug = wikislug.replace(/\w\S*/gi, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1);});
-          wikislug = wikislug.replace(/\s*/g, "");
-				  e.value = wikislug;
+				  e.value = slug;
 			  }
 	      });
 	  });

diff --git a/wiki/views/article.py b/wiki/views/article.py
@@ -62,7 +62,15 @@ def get_form(self, form_class):
         initial['slug'] = self.request.GET.get('slug', None)
         kwargs['initial'] = initial
         form = form_class(self.request, self.urlpath, **kwargs)
-        form.fields['slug'].widget = forms.TextInputPrepend(prepend='/'+self.urlpath.path)
+        form.fields['slug'].widget = forms.TextInputPrepend(
+            prepend='/'+self.urlpath.path,
+            attrs={
+                # Make patterns force lowercase if we are case insensitive to bless the user with a
+                # bit of strictness, anyways
+                'pattern': '[a-z0-9_]+' if not settings.URL_CASE_SENSITIVE else '[a-zA-Z0-9_]+',
+                'title': 'Lowercase letters, numbers, and underscores' if not settings.URL_CASE_SENSITIVE else 'Letters, numbers, and underscores',
+            }
+        )
         return form
 
     def form_valid(self, form):