#68 closed: "Show public user list with links to their profiles"

colladoc · Jul 26, 2011 · 52571d6 · 52571d6
1 parent 46078b6
commit 52571d6
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 17 deletions.
diff --git a/src/main/scala/scala/tools/colladoc/lib/sitemap/ProfileStuff.scala b/src/main/scala/scala/tools/colladoc/lib/sitemap/ProfileStuff.scala
@@ -26,11 +26,11 @@ package sitemap
 
 import xml.Text
 import net.liftweb.sitemap.Loc
-import net.liftweb.http.{RewriteResponse, ParsePath, RewriteRequest}
 import net.liftweb.util.NamedPF
 import net.liftweb.common.Full
 import net.liftweb.mapper.By
 import model.mapper.User
+import net.liftweb.http.{NotFoundResponse, RewriteResponse, ParsePath, RewriteRequest}
 
 /** Profile location parameter. */
 case class ProfileLoc()
@@ -57,9 +57,7 @@ object ProfileStuff extends Loc[ProfileLoc] {
   /** Rewrite location. */
   override val rewrite: LocRewrite = Full(NamedPF("Profile Rewrite") {
     case RewriteRequest(ParsePath("profile" :: username :: Nil, _, _, _), _, _)
-      if (User.superUser_? && !User.find(By(User.userName, username)).isEmpty) =>
+      if (!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/page/Profile.scala b/src/main/scala/scala/tools/colladoc/page/Profile.scala
@@ -43,9 +43,9 @@ class Profile(rootPack: Package) extends scala.tools.colladoc.page.Template(root
         <div id="profile_tabs">
           <ul>
             <li><a href="#profile_tab">Public Profile</a></li>
-            <li><a href="#account_admin_tab">Account Admin</a></li>
+            <li id="account_href"><a href="#account_admin_tab">Account Admin</a></li>
             <li><a href="#comments_tab">Comments</a></li>
-            <li><a href="#discussion_comments_tab">Discussion Comments</a></li>
+            <li id="discussion_href"><a href="#discussion_comments_tab">Discussion Comments</a></li>
           </ul>
           <div id="profile_tab">
             <profile:form />

diff --git a/src/main/scala/scala/tools/colladoc/snippet/ProfileOps.scala b/src/main/scala/scala/tools/colladoc/snippet/ProfileOps.scala
@@ -34,6 +34,7 @@ import net.liftweb.http.js.JsCmds.{Noop, RedirectTo, SetValById}
 import net.liftweb.http.js.JE.Str
 import net.liftweb.http.js.{JsCmds, JsCmd}
 import page.{Template, History, Profile}
+import net.liftweb.common.Full
 
 /**
  * User profile snippet.
@@ -46,7 +47,26 @@ class ProfileOps {
 
   def title(xhtml: NodeSeq): NodeSeq = Text(getUser.userName.is)
 
-  def getUser = User.find(By(User.userName, username)).open_!
+  def getUser = {
+    val maybeUser = User.find(By(User.userName, username))
+    if (maybeUser.isEmpty)
+      S.redirectTo("/")
+    maybeUser.open_!
+  }
+
+  def public_?(): Boolean = {
+    if (!User.loggedIn_?)
+      return true
+    if (User.superUser_?)
+      return false
+    User.currentUser match {
+      case Full(u) =>
+        if (u == getUser)
+          return false
+        true
+      case _ => true
+    }
+  }
 
   private def userForm(user: User): NodeSeq = {
     def doSave(): JsCmd = {
@@ -109,6 +129,21 @@ class ProfileOps {
     )
   }
 
+  def publicProfile(user: User) = {
+    <lift:form class="form profile_form">
+      <fieldset>
+        <p>
+          <label>Username</label>
+          <span>{user.userName}</span>
+        </p>
+        <p>
+          <label>Full Name</label>
+          <span>{user.shortName}</span>
+        </p>
+      </fieldset>
+    </lift:form>
+  }
+
   def changePasswordForm(user: User) = {
     var oldPass, newPass, confirm: String = ""
 
@@ -211,13 +246,14 @@ class ProfileOps {
         {dscs map dToHtml _}
       </ul>
 
-    bind("profile", profile.body,
-      "form"     -> userForm(user),
-      "change_password" -> changePasswordForm(user),
-      "delete_profile" -> deleteProfile(user),
-      "fullname" -> Text(fullname),
-      "comments" -> comments,
-      "discussion_comments" -> discussionComments
+    bind("profile",
+      profile.body,
+      "form"                -> { if (!public_?) userForm(user) else publicProfile(user) },
+      "change_password"     -> { if (!public_?) changePasswordForm(user) else NodeSeq.Empty },
+      "delete_profile"      -> { if (!public_?) deleteProfile(user) else NodeSeq.Empty },
+      "discussion_comments" -> { if (!public_?) discussionComments else NodeSeq.Empty },
+      "fullname"            -> Text(fullname),
+      "comments"            -> comments
     )
   }
 }
diff --git a/src/main/webapp/scripts/coprofile.js b/src/main/webapp/scripts/coprofile.js
@@ -22,7 +22,13 @@
  */
 
 $(document).ready(function() {
-    $("#profile_tabs").tabs();
-    $(".profile_form").validate();
-    $(".change_password_form").validate();
+  if ($("#account_admin_tab").children().length == 0)
+    $("#account_href").remove();
+
+  if ($("#discussion_comments_tab").children().length == 0)
+    $("#discussion_href").remove();
+
+  $("#profile_tabs").tabs();
+  $(".profile_form").validate();
+  $(".change_password_form").validate();
 });