added current user profile at /profile

colladoc · Jul 14, 2011 · 6ef6ea2 · 6ef6ea2
1 parent 532e425
commit 6ef6ea2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/scala/scala/tools/colladoc/lib/sitemap/ProfileStuff.scala b/src/main/scala/scala/tools/colladoc/lib/sitemap/ProfileStuff.scala
@@ -59,5 +59,7 @@ object ProfileStuff extends Loc[ProfileLoc] {
     case RewriteRequest(ParsePath("profile" :: username :: Nil, _, _, _), _, _)
       if (User.superUser_? && !User.find(By(User.userName, username)).isEmpty) =>
        (RewriteResponse("profile" :: Nil, Map("username" -> username)), ProfileLoc())
+    case RewriteRequest(ParsePath("profile" :: Nil, _, _, _), _, _) if (!User.loggedIn_?) =>
+      (RewriteResponse("" :: Nil), ProfileLoc())
   })
 }
diff --git a/src/main/scala/scala/tools/colladoc/snippet/ProfileOps.scala b/src/main/scala/scala/tools/colladoc/snippet/ProfileOps.scala
@@ -42,7 +42,7 @@ import net.liftweb.http.js.{JsCmds, JsCmd}
  * @author Sergey Ignatov
  */
 class ProfileOps {
-  object username extends RequestVar[String](S.param("username") openOr "")
+  object username extends RequestVar[String](S.param("username") openOr (User.currentUser.map(_.userName.is) openOr ""))
 
   lazy val profile = new Profile(model.vend.rootPackage)