From 87f24a86fbaafc8bf905739d96528a1dd15ae491 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Wed, 30 Sep 2015 14:55:16 +0200 Subject: [PATCH] Fixed headline, added calendar to sla overview. --- app/assets/javascripts/app/controllers/sla.coffee | 1 + app/assets/javascripts/app/views/sla/index.jst.eco | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/app/controllers/sla.coffee b/app/assets/javascripts/app/controllers/sla.coffee index 34fe33a0b..1dcb5b536 100644 --- a/app/assets/javascripts/app/controllers/sla.coffee +++ b/app/assets/javascripts/app/controllers/sla.coffee @@ -40,6 +40,7 @@ class Index extends App.ControllerContent if sla.solution_time sla.solution_time_in_text = @toText(sla.solution_time) sla.rules = App.UiElement.ticket_selector.humanText(sla.condition) + sla.calendar = App.Calendar.find(sla.calendar_id) # show description button, only if content exists showDescription = false diff --git a/app/assets/javascripts/app/views/sla/index.jst.eco b/app/assets/javascripts/app/views/sla/index.jst.eco index 8fdcc9ea6..0ef2612cb 100644 --- a/app/assets/javascripts/app/views/sla/index.jst.eco +++ b/app/assets/javascripts/app/views/sla/index.jst.eco @@ -19,7 +19,7 @@
-

<%= sla.name %>

+

<%= sla.name %>

<%- @T('Filter') %>
@@ -39,6 +39,9 @@ <% if sla.solution_time: %> <%- sla.solution_time_in_text %> <%- @T('hours') %> - <%- @T('Solution Time') %> <% end %> +
+
<%- @T('Calendar') %>
+ <%= sla.calendar.displayName() %>