# HG changeset patch # User Tomas Zeman # Date 1334903182 -7200 # Node ID 9d1ee662c7366121f6d22410d8c57ea03318c903 # Parent 08c42c1684f32d9dcd92dd3080acbc12855c2039 Contact link diff -r 08c42c1684f3 -r 9d1ee662c736 src/main/scala/fis/crm/ui/ContactSnippet.scala --- a/src/main/scala/fis/crm/ui/ContactSnippet.scala Fri Apr 20 08:26:22 2012 +0200 +++ b/src/main/scala/fis/crm/ui/ContactSnippet.scala Fri Apr 20 08:26:22 2012 +0200 @@ -64,7 +64,7 @@ val menu = listM submenus(viewM, editM, createM, deleteM) - private def list: CssTr = ContactTable(CrmSchema.allContacts) + private def list: CssTr = { _ => ContactTable(CrmSchema.allContacts) } private def panel: CssTr = "*" #> viewLoc.currentValue.map { ContactPanel(_) } @@ -72,6 +72,13 @@ def view: Contact => Box[String] = (viewLoc.calcHref _) andThen (Box !! _) } + private case class ContactLink(c: Contact) extends EntityLink[Contact](c, + url.view) { + override def displayName = l10n("contact.name") + } + + EntityLink.register[Contact](ContactLink(_)) + private object form extends HorizontalScreen with CancelButton with SaveButton { object c extends ScreenVar[Contact](Contact.createRecord) diff -r 08c42c1684f3 -r 9d1ee662c736 src/main/scala/fis/crm/ui/ContactTable.scala --- a/src/main/scala/fis/crm/ui/ContactTable.scala Fri Apr 20 08:26:22 2012 +0200 +++ b/src/main/scala/fis/crm/ui/ContactTable.scala Fri Apr 20 08:26:22 2012 +0200 @@ -15,27 +15,19 @@ */ package fis.crm.ui +import fis.base.ui._ import fis.crm.model._ import net.liftweb.util._ +import net.tz.lift.model._ import net.tz.lift.snippet._ import scala.xml.Text -object ContactTable { +object ContactTable extends FieldTable[Contact] { - def fields(c: Contact) = Seq(ContactLink(c), c.position, c.workMail, + def fields(c: Contact) = EntityLink(c) ++ Seq(c.position, c.workMail, c.workPhone, c.workMobile) - def apply(l: Iterable[Contact]): CssTr = - new DataTable(fields(Contact) map { _.displayName } toList, - l map { c => fields(c) map { _.asHtml } toList } toList) -} - -case class ContactLink(c: Contact) extends ReadableField { - type ValueType = String - def name = "linkName" - override def asHtml = a(ContactSnippet.url.view(c))(Text(c.linkName)) - def get = c.linkName - def is = c.linkName + def apply(l: Iterable[Contact]) = build(Contact, l) } // vim: set ts=2 sw=2 et: diff -r 08c42c1684f3 -r 9d1ee662c736 src/main/webapp/templates-hidden/_resources.html --- a/src/main/webapp/templates-hidden/_resources.html Fri Apr 20 08:26:22 2012 +0200 +++ b/src/main/webapp/templates-hidden/_resources.html Fri Apr 20 08:26:22 2012 +0200 @@ -22,6 +22,7 @@ Invalid email address. + Name Note First name Last name diff -r 08c42c1684f3 -r 9d1ee662c736 src/main/webapp/templates-hidden/_resources_cs.html --- a/src/main/webapp/templates-hidden/_resources_cs.html Fri Apr 20 08:26:22 2012 +0200 +++ b/src/main/webapp/templates-hidden/_resources_cs.html Fri Apr 20 08:26:22 2012 +0200 @@ -22,6 +22,7 @@ Nesprávná emailová adresa. + Jméno Poznámka Jméno Příjmení