Default comment display for Colladoc

gistfile1.diff

diff --git a/src/main/scala/scala/tools/colladoc/model/mapper/Comment.scala b/src/main/scala/scala/tools/colladoc/model/mapper/Comment.scala
index aec1bd9..05ae65e 100644
--- a/src/main/scala/scala/tools/colladoc/model/mapper/Comment.scala
+++ b/src/main/scala/scala/tools/colladoc/model/mapper/Comment.scala
@@ -123,7 +123,7 @@ object Comment extends Comment with LongKeyedMetaMapper[Comment]
    * @return default change if exists, none otherwise
    */
   def default(qualName: String) = Comment.findAll(By(Comment.qualifiedName, qualName),
-    By(Comment.valid, true), By(Comment.active, true),
+    By(Comment.valid, true), NotNullRef(Comment.active), By(Comment.active, true),
     OrderBy(Comment.dateTime, Descending), MaxRows(1)) match {
     case List(c: Comment, _*) => Some(c)
     case _ => None
diff --git a/src/main/scala/scala/tools/colladoc/page/Template.scala b/src/main/scala/scala/tools/colladoc/page/Template.scala
index b67dcc7..f5fbf31 100644
--- a/src/main/scala/scala/tools/colladoc/page/Template.scala
+++ b/src/main/scala/scala/tools/colladoc/page/Template.scala
@@ -131,6 +131,11 @@ class Template(tpl: DocTemplateEntity) extends tools.nsc.doc.html.page.Template(
     }
   }
 
+  private def defaultComment(mbr: MemberEntity) = Comment.default(mbr.uniqueName) match {
+    case Some(c) => Full(c.id.is.toString)
+    case None => Empty
+  }
+
   /** Default value for select with changesets. */
   private def defaultItem(tag: AnyRef) = tag match {
     case cmt: Comment => Full(cmt.id.is.toString)
@@ -151,7 +156,7 @@ class Template(tpl: DocTemplateEntity) extends tools.nsc.doc.html.page.Template(
       (if (!isSelf) JqId(Str(id(mbr, "short"))) ~> JqHtml(inlineToHtml(cmt.short)) ~> JqAttr("id", id(m, "short")) else JsCmds.Noop)
     }
     val revs = Comment.revisions(mbr.uniqueName) ::: ("source", "Source Comment") :: Nil
-    SHtml.ajaxSelect(revs, defaultItem(mbr.tag), replace _, ("class", "select"))
+    SHtml.ajaxSelect(revs, defaultComment(mbr), replace _, ("class", "select"))
   }
 
     /** Render revision selection for member entity. */