diff --git a/build.sh b/build.sh index a72f8b8b..e0932b96 100755 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ # set -e -RELEASE_VERSION="1.4.469" +RELEASE_VERSION="1.4.470" TOPDIR=/tmp/orchestrator-release export RELEASE_VERSION TOPDIR diff --git a/resources/public/js/audit-recovery.js b/resources/public/js/audit-recovery.js index 40823182..5c910921 100644 --- a/resources/public/js/audit-recovery.js +++ b/resources/public/js/audit-recovery.js @@ -22,7 +22,8 @@ $(document).ready(function () { var ack = $(''); if (audit.Acknowledged) { ack.addClass("glyphicon-ok-sign").addClass("text-primary"); - ack.attr("title", "Acknowledged by "+audit.AcknowledgedBy+" at "+audit.AcknowledgedAt+": "+audit.AcknowledgedComment); + var ackTitle = "Acknowledged by "+audit.AcknowledgedBy+" at "+audit.AcknowledgedAt+": "+audit.AcknowledgedComment; + ack.attr("title", ackTitle); } else { ack.addClass("glyphicon-question-sign").addClass("text-danger").addClass("unacknowledged"); ack.attr("data-recovery-id", audit.Id); @@ -43,24 +44,31 @@ $(document).ready(function () { $('', { text: "pending" }).appendTo(row); } var moreInfo = ""; + if (audit.Acknowledged) { + moreInfo += '
Acknowledged by '+audit.AcknowledgedBy+', '+audit.AcknowledgedAt+'
'; + } else { + moreInfo += '
Unacknowledged
'; + } if (audit.LostSlaves.length > 0) { moreInfo += "
Lost slaves:
"; } if (audit.ParticipatingInstanceKeys.length > 0) { moreInfo += "
Participating instances:
"; } if (audit.AnalysisEntry.SlaveHosts.length > 0) { moreInfo += '
'+audit.AnalysisEntry.CountSlaves+' slave hosts :
"; }