From 8a2d977a8a2dabb1513bb4f809fbf3ee5c641c72 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@proxience.com>
Date: Tue, 21 Oct 2014 00:35:40 +0200
Subject: Dashboard: work on graphs for operations (refs #2076)

* add a new creation date field for operations
* refactoring of management of dashboard forms
* dashboard form for operations
---
 .../templates/ishtar/dashboards/dashboard_main_detail.html     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'ishtar_common/templates')

diff --git a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html
index 820c50136..87ce5c528 100644
--- a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html
+++ b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html
@@ -141,7 +141,7 @@ var plot_{{unique_id}} = $.jqplot('chart_{{unique_id}}',
         sizeAdjust: 7.5
       },
       series:[{% for label in dashboard.serie_labels %}
-        {%if forloop.counter0%}, {% endif %}{label:"{{label}}"}{% endfor %}
+        {%if forloop.counter0%}, {% endif %}{label:"{{label}}", showmarker:showmarker}{% endfor %}
       ],
       cursor:{
         show: true,
@@ -172,9 +172,9 @@ $('#search_{{unique_id}}').click(function (){
     return false;
 });
 
-{% ifequal item_name 'files' %}
-load_jquerydate_after();
-load_jquerydate_before();
-{% endifequal %}
+{% if item_name == 'files' or item_name == "operations"%}
+load_jquerydate_{{item_name}}_after();
+load_jquerydate_{{item_name}}_before();
+{% endif %}
 });
 </script>
-- 
cgit v1.2.3