From 5ad0cc2dd0775fbed67788a7085ce6e6f9ce7d8b Mon Sep 17 00:00:00 2001 From: palewire Date: Fri, 9 Jan 2009 12:33:50 -0800 Subject: [PATCH] Fixed some itty bitty problems with chart_markers --- googlecharts/templatetags/charts.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/googlecharts/templatetags/charts.py b/googlecharts/templatetags/charts.py index d57aad2..b0432ba 100644 --- a/googlecharts/templatetags/charts.py +++ b/googlecharts/templatetags/charts.py @@ -409,24 +409,24 @@ def chart_marker(marker, color, dataset_index, data_point, size): marker = marker_types.get(marker, marker) return {"chm": smart_join(",", marker, color, dataset_index, data_point, size)} -@option("chart-makers", multi="|") +@option("chart-markers", multi="|") def chart_markers(dataset_index, iterable): """Provide an iterable yielding (type, color, point, size)""" try: it = iter(iterable) except TypeError: return {} - + markers = [] for m in it: try: - marker, color, point, size = m + marker, color, data_point, size = m except ValueError: continue - marker - marker_types.get(marker, marker) + marker = marker_types.get(marker, marker) markers.append(smart_join(",", marker, color, dataset_index, data_point, size)) - - return {"chm": smart_join("|", markers)} + + return {"chm": smart_join("|", *flatten(markers))} @option("chart-map-area") def chart_map_area(where):