1. multiple tags in select field fixed

2. admin statistic (section/event) date range error fixed; 'no data" message added

article/admin_urls.py

@@ -4,10 +4,13 @@ from admin import BlogList, BlogView, NewsList, NewsView, ArticleDeleteView
 
 urlpatterns = patterns('article.admin',
     url(r'^blog/all/$', BlogList.as_view()),
-    url(r'^blog/$', BlogView.as_view()),
-    url(r'^delete/(?P<slug>.*)/$', ArticleDeleteView.as_view()),
     url(r'^news/all/$', NewsList.as_view()),
+
+    url(r'^delete/(?P<slug>.*)/$', ArticleDeleteView.as_view()),
+
+    url(r'^blog/$', BlogView.as_view()),
     url(r'^news/$', NewsView.as_view()),
+
     url(r'^blog/(?P<slug>.*)/$', BlogView.as_view()),
     url(r'^news/(?P<slug>.*)/$', NewsView.as_view()),
 )

stats_collector/admin.py

@@ -194,6 +194,7 @@ class StatSectionsView(StatBaseView):
         if self.request.is_ajax():
             return context
 
+        if self.qs:
             pt = self.get_pivot_table()
 
             # change numpy.nan values to python's None (js null with json)
@@ -217,7 +218,6 @@ class StatSectionsView(StatBaseView):
                     'name': self.get_col_map()[key],
                     'val': val
                 })
-
             context['data'] = data
             context['data_summary'] = data_summary
         return context
@@ -257,6 +257,7 @@ class EventStatView(StatBaseView):
         return self.render_to_response(self.get_context_data(form=form))
 
     def get_params_form(self):
+        form_kwargs = {}
         country_ids = set()
         city_ids = set()
         theme_ids = set()
@@ -271,8 +272,10 @@ class EventStatView(StatBaseView):
             'exposition__tag',
             'conference__tag',
             ]
+        values_list = self.qs.values_list(*val_list)
+        if values_list:
             e_country_ids, c_country_ids, e_city_ids, c_city_ids, e_theme_ids, c_theme_ids, e_tag_ids, c_tag_ids = \
-            zip(*self.qs.values_list(*val_list))
+                zip(*values_list)
             country_ids.update(e_country_ids)
             country_ids.update(c_country_ids)
             city_ids.update(e_city_ids)

stats_collector/forms.py

@@ -27,8 +27,14 @@ class BaseDateFilter(forms.Form):
     date_end = forms.DateField(label=_(u'Дата окончания'), input_formats=['%Y-%m-%d', '%d.%m.%Y'], required=False)
 
     def clean(self):
-        if not self.cleaned_data['date_begin'] and self.cleaned_data['date_end']:
+        date_begin = self.cleaned_data['date_begin']
-            self.cleaned_data['date_begin'] = self.cleaned_data['date_end'] - timedelta(days=14)
+        date_end = self.cleaned_data['date_end']
+        if not date_begin and date_end:
+            self.cleaned_data['date_begin'] = date_end - timedelta(days=14)
+        elif date_begin and date_end and date_begin >= date_end:
+            raise forms.ValidationError(
+                _(u'Дата начала должна быть меньше даты окончания.'),
+                code='invalid')
         return self.cleaned_data
 
 
@@ -70,10 +76,10 @@ class EventsParamsFilter(forms.Form):
     tag = forms.TypedMultipleChoiceField(label=_(u'Тег'), required=False, coerce=int)
 
     def __init__(self, *args, **kwargs):
-        country_choices = kwargs.pop('country_choices')
+        country_choices = kwargs.pop('country_choices', [])
-        city_choices = kwargs.pop('city_choices')
+        city_choices = kwargs.pop('city_choices', [])
-        theme_choices = kwargs.pop('theme_choices')
+        theme_choices = kwargs.pop('theme_choices', [])
-        tag_choices = kwargs.pop('tag_choices')
+        tag_choices = kwargs.pop('tag_choices', [])
 
         super(EventsParamsFilter, self).__init__(*args, **kwargs)
 

templates/admin/stats/event_stat.html

@@ -146,6 +146,9 @@
   </div>
 
   <div class="span9">
+    {% if not data %}
+      {% trans "Нет данных" %}
+    {% endif %}
     <div id="curve_chart"></div> 
     <div id="bar_chart"></div> 
   </div>

templates/admin/stats/section_stat.html

@@ -7,6 +7,7 @@
   
   <script type="text/javascript">
     google.charts.load('current', {'packages':['corechart'], 'language': '{{ LANGUAGE_CODE }}'});
+    {% if data %}
 
       function drawChart() {
         var data = google.visualization.arrayToDataTable([
@@ -31,7 +32,10 @@
 
         chart.draw(data, options);
       }
+      google.charts.setOnLoadCallback(drawChart);
+    {% endif %}
 
+    {% if data_summary %}
       function drawSummaryChart() {
         var data = google.visualization.arrayToDataTable([
           {% autoescape off %}
@@ -56,9 +60,9 @@
 
         rchart.draw(data, options);
       }
-
-    google.charts.setOnLoadCallback(drawChart);
       google.charts.setOnLoadCallback(drawSummaryChart);
+    {% endif %}
+
 
     function initStatFilterForm() {
       form = $('form#stat_filter_form');
@@ -95,7 +99,6 @@
               }
             });
           }
-          console.log(data);
         })
       });
     }
@@ -185,6 +188,9 @@
   </div>
 
   <div class="span9">
+    {% if not data %}
+      {% trans "Нет данных" %}
+    {% endif %}
     <div id="curve_chart"></div> 
     <div id="bar_chart"></div> 
   </div>

theme/admin.py

@@ -157,9 +157,9 @@ def search_tag(request):
 
 
     if not term:
-        qs = Tag.objects.filter(theme__id__in=theme_ids).order_by('translations__name')
+        qs = Tag.objects.filter(theme__id__in=theme_ids).order_by('translations__name').distinct()
     else:
-        qs = Tag.objects.filter(theme__id__in=theme_ids, translations__name__contains=term)
+        qs = Tag.objects.filter(theme__id__in=theme_ids, translations__name__contains=term).distinct()
 
     tags = [{'id': tag.id, 'label': '%s(%s)'%(tag.name, tag.theme.name)} for tag in qs]