fix

colladoc · Jul 28, 2011 · 018a45f · 018a45f
1 parent d1bf74d
commit 018a45f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/scala/scala/tools/colladoc/page/Template.scala b/src/main/scala/scala/tools/colladoc/page/Template.scala
@@ -173,7 +173,7 @@ class Template(tpl: DocTemplateEntity) extends tools.nsc.doc.html.page.Template(
     </div>
 
   /** Render discussion comment. */
-  def discussionToHtml(d: Discussion, level: Int = 0) = {
+  def discussionToHtml(d: Discussion, level: Int = 0, withReplies: Boolean = false) = {
     val replies = Discussion.replies(d)
 
     <xml:group>
@@ -197,20 +197,21 @@ class Template(tpl: DocTemplateEntity) extends tools.nsc.doc.html.page.Template(
 
           </li>
         } else
-          if(replies.length > 0)
+          if (replies.length > 0)
             <li class={"discussion_comment discussion_level_" + level}>
               <div class="discussion_content discussion_deleted">Comment deleted</div>
             </li>
       }
       {
-        replies.map(d => discussionToHtmlWithActions(d, if (level < 3) level + 1 else 4))
+        if (withReplies)
+          replies.map(d => discussionToHtmlWithActions(d, if (level < 3) level + 1 else 4))
       }
     </xml:group>
   }
 
   /** Render discussion comment with actions. */
   private def discussionToHtmlWithActions(d: Discussion, level: Int = 0): NodeSeq = bind("discussion_comment",
-    discussionToHtml(d, level),
+    discussionToHtml(d, level, true),
     "edit"   -> { if (User.validSuperUser_?) editDiscussionButton(d)   else NodeSeq.Empty },
     "delete" -> { if (User.validSuperUser_?) deleteDiscussionButton(d) else NodeSeq.Empty },
     "reply"  -> { if (!User.banned_?)   replyDiscussionButton(d)  else NodeSeq.Empty }

diff --git a/src/main/scala/scala/tools/colladoc/snippet/ProfileOps.scala b/src/main/scala/scala/tools/colladoc/snippet/ProfileOps.scala
@@ -257,7 +257,7 @@ class ProfileOps {
       "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 },
+      "discussion_comments" -> { if (User.loggedIn_?) discussionComments else NodeSeq.Empty },
       "fullname"            -> Text(fullname),
       "comments"            -> comments
     )