# HG changeset patch # User cavaliet # Date 1413384086 -7200 # Node ID c75242f189e74b4c329593a9134b75e14dbe3955 # Parent 7dd0f7176693dcd66bd73b6bb40582c0cc66cafb v1.53.13 : enable polemics list override in iframe diff -r 7dd0f7176693 -r c75242f189e7 src/ldt/ldt/__init__.py --- a/src/ldt/ldt/__init__.py Fri Oct 03 11:14:41 2014 +0200 +++ b/src/ldt/ldt/__init__.py Wed Oct 15 16:41:26 2014 +0200 @@ -1,6 +1,6 @@ __all__ = ["VERSION", "get_version", "__version__"] -VERSION = (1, 53, 12, "final", 0) +VERSION = (1, 53, 13, "final", 0) def get_version(): diff -r 7dd0f7176693 -r c75242f189e7 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_iframe.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_iframe.html Fri Oct 03 11:14:41 2014 +0200 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_iframe.html Wed Oct 15 16:41:26 2014 +0200 @@ -101,6 +101,9 @@ max_elements: {{ polemic__max_elements }}, defaultcolor: "#{{ polemic_defaultColor }}", foundcolor: "#{{ polemic_foundColor }}", + {% if polemics_list %} + polemics : {{ polemics_list|safe }} + {% else %} polemics : [ { "name" : "OK", @@ -123,6 +126,7 @@ "color" : "#{{ polemic_qColor }}" } ] + {% endif %} } {% endif %} {% if sparkline %} diff -r 7dd0f7176693 -r c75242f189e7 src/ldt/ldt/ldt_utils/views/workspace.py --- a/src/ldt/ldt/ldt_utils/views/workspace.py Fri Oct 03 11:14:41 2014 +0200 +++ b/src/ldt/ldt/ldt_utils/views/workspace.py Wed Oct 15 16:41:26 2014 +0200 @@ -172,6 +172,16 @@ rend_dict["polemic_qColor"] = request.GET.get("polemic_qColor") else: rend_dict["polemic_qColor"] = "036aae" + if request.GET.has_key("polemics_list"): + try: + # Very rough : has to be something like + # [{"name":"OK","keywords":["%2B%2B"],"color":"%23DDDDDD"},{"name":"KO","keywords":["--"],"color":"%23AAAAAA"},{"name":"REF","keywords":["==","http://"],"color":"%23777777"},{"name":"Q","keywords":["?"],"color":"%23333333"}] + pd = request.GET.get("polemics_list") + except: + pd = False + rend_dict["polemics_list"] = pd + else: + rend_dict["polemics_list"] = False if request.GET.has_key("polemic__max_elements"): try: pme = int(request.GET.get("polemic__max_elements"))