Don't need to validate username on profile-update

Conflicts: src/clojars/web/user.clj
hugoduncan · Mar 10, 2012 · 7df6380 · 7df6380
1 parent 339d282
commit 7df6380
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/clojars/web/user.clj b/src/clojars/web/user.clj
@@ -49,10 +49,11 @@
       (conj-when (blank? password) "Password can't be blank")
       (conj-when (not= password confirm)
                  "Password and confirm password must match")
-      (conj-when (or (reserved-names user)    ; "I told them we already
+      (conj-when (and (nil? account) ; only check username on register
-                     (and (not= account user) ; got one!"
+                      (or (reserved-names user)  ; "I told them we already
-                          (find-user user))
+                          (and (not= account user) ; got one!"
-                     (seq (group-members user)))
+                               (find-user user))
+                          (seq (group-members user))))
                  "Username is already taken")
       (conj-when (not (re-matches #"[a-z0-9_-]+" user))
                  (str "Usernames must consist only of lowercase "