--- a/src/main/scala/radview/snippet/AccountSnippet.scala Tue Apr 12 19:10:31 2011 +0200
+++ b/src/main/scala/radview/snippet/AccountSnippet.scala Tue Apr 12 19:10:43 2011 +0200
@@ -307,7 +307,7 @@
Bytes.mb(sess map { _.outBytes.is } sum))
) map { r => new AttrRow(Text(r._1), Text(r._2.toString),
"attr-name-wide", "attr-value") } ) &
- ".list" #> CdrTable(Cdr.findAll( (qp:+MaxRows(mxCnt.is) ):_*))
+ ".list" #> CdrTable(Cdr.findAll( (qp:+MaxRows(mxCnt.is) ):_*), a.isAdsl)
} openOr ClearNodes
}
--- a/src/main/scala/radview/snippet/SessionSnippet.scala Tue Apr 12 19:10:31 2011 +0200
+++ b/src/main/scala/radview/snippet/SessionSnippet.scala Tue Apr 12 19:10:43 2011 +0200
@@ -119,7 +119,7 @@
object CdrTable {
import Cdr._
- def apply(cdr: Iterable[Cdr]): (NodeSeq => NodeSeq) = {
+ def apply(cdr: Iterable[Cdr], isAdsl: Boolean): (NodeSeq => NodeSeq) = {
def cssF(f: MappedField[_, Cdr])(cdr: Cdr): Box[String] = {
f.actualField(cdr).is match {
@@ -151,10 +151,15 @@
val cdr2Cols = List(serviceOption, releaseInd).map { f =>
new Column[Cdr](Text(f.displayName), valF(f) _, cssF(f) _) }
- Table[Cdr](cdrCols ++ cellCols ++ cdr2Cols, cdr)
+ val cols = cdrCols ++ (isAdsl match {
+ case true => Nil
+ case false => cellCols ++ cdr2Cols
+ })
+ Table[Cdr](cols, cdr)
}
- def apply(s: CdrSession): (NodeSeq => NodeSeq) = apply(bySession(s))
+ def apply(s: CdrSession): (NodeSeq => NodeSeq) = apply(bySession(s),
+ s.cell.isEmpty)
}
// vim: set ts=2 sw=2 et: