diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/model/JsInitContextLinkUtil.scala b/rudder-web/src/main/scala/com/normation/rudder/web/model/JsInitContextLinkUtil.scala
index 54de354e10d..f6a3d66d2ea 100644
--- a/rudder-web/src/main/scala/com/normation/rudder/web/model/JsInitContextLinkUtil.scala
+++ b/rudder-web/src/main/scala/com/normation/rudder/web/model/JsInitContextLinkUtil.scala
@@ -59,22 +59,22 @@ object JsInitContextLinkUtil extends Loggable {
private[this] val roDirectiveRepository = RudderConfig.roDirectiveRepository
def groupLink(id:NodeGroupId) =
- s"""/secure/nodeManager/groups#{"groupId":"${id.value}"}"""
+ s"""${S.contextPath}/secure/nodeManager/groups#{"groupId":"${id.value}"}"""
def ruleLink(id:RuleId) =
- s"""/secure/configurationManager/ruleManagement#{"ruleId":"${id.value}"}"""
+ s"""${S.contextPath}/secure/configurationManager/ruleManagement#{"ruleId":"${id.value}"}"""
def directiveLink(id:DirectiveId) =
- s"""/secure/configurationManager/directiveManagement#{"directiveId":"${id.value}"}"""
+ s"""${S.contextPath}/secure/configurationManager/directiveManagement#{"directiveId":"${id.value}"}"""
def nodeLink(id:NodeId) =
- s"""/secure/nodeManager/searchNodes#{"nodeId":"${id.value}"}"""
+ s"""${S.contextPath}/secure/nodeManager/searchNodes#{"nodeId":"${id.value}"}"""
def globalParameterLink(name:ParameterName) =
- s"/secure/configurationManager/parameterManagement"
+ s"${S.contextPath}/secure/configurationManager/parameterManagement"
def changeRequestLink(id:ChangeRequestId) =
- s"/secure/utilities/changeRequest/${id}"
+ s"${S.contextPath}/secure/utilities/changeRequest/${id}"
def createRuleLink(id:RuleId) = {
roRuleRepository.get(id) match {
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/services/EventListDisplayer.scala b/rudder-web/src/main/scala/com/normation/rudder/web/services/EventListDisplayer.scala
index 47a69c1b0bc..35e9d655df5 100644
--- a/rudder-web/src/main/scala/com/normation/rudder/web/services/EventListDisplayer.scala
+++ b/rudder-web/src/main/scala/com/normation/rudder/web/services/EventListDisplayer.scala
@@ -73,6 +73,7 @@ import com.normation.rudder.domain.eventlog.WorkflowStepChanged
import com.normation.rudder.domain.workflows.WorkflowStepChange
import com.normation.rudder.domain.parameters._
import com.normation.rudder.api._
+import net.liftweb.json.JString
/**
* Used to display the event list, in the pending modification (AsyncDeployment),
@@ -89,168 +90,69 @@ class EventListDisplayer(
) extends Loggable {
private[this] val xmlPretty = new scala.xml.PrettyPrinter(80, 2)
- // private[this] val gridName = "eventLogsGrid"
- // private[this] val jsGridName = "oTable" + gridName
-
- def display(events:Seq[EventLog], gridName:String) : NodeSeq = {
-
- (
- "tbody *" #> ("tr" #> events.map { event =>
- ".eventLine [jsuuid]" #> Text(gridName + "-" + event.id.getOrElse(0).toString) &
- ".eventLine [id]" #> event.id.getOrElse(0).toString &
- ".eventLine [class]" #> {
- if (event.details !=
ID | -Date | -Actor | -Event Type | -Description | -
---|---|---|---|---|
[ID of event] | -[Date and time of event] | -[actor of the event] | -[type of event] | -[some user readable info] | -