1380: Этап №4 - Пустая тематика на конференциях

conference/admin.py

@@ -26,6 +26,7 @@ from forms import (
 )
 from functions.admin_views import (
     AdminListView,
+    AdminListViewNoThemeMixin,
     AdminView,
     stat_paginate_results,
     upload_photo
@@ -310,6 +311,10 @@ class ConferenceListView(AdminListView):
     model = Conference
 
 
+class ConferenceListViewNoTheme(AdminListViewNoThemeMixin, ConferenceListView):
+    pass
+
+
 def upload_conference_photo(request, conf_id):
     return upload_photo(request, conf_id, Conference)
 

conference/admin_urls.py

@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 from django.conf.urls import patterns, include, url
-from admin import ConferenceListView, ConferenceView
+from admin import ConferenceListView, ConferenceView, ConferenceListViewNoTheme
 
 urlpatterns = patterns('conference.admin',
     url(r'^upload-photo/(?P<conf_id>.*)/$', 'upload_conference_photo'),
     url(r'^delete/(?P<url>.*)$', 'conference_delete'),
     url(r'^copy/$', 'conf_copy'),
-    url(r'^all/$', ConferenceListView.as_view()),
+    url(r'^all/$', ConferenceListView.as_view(), name='admin-conference-all'),
+    url(r'^notheme/$', ConferenceListViewNoTheme.as_view(), name='admin-conference-notheme'),
     #url(r'^change/(?P<url>.*)/$', 'conference_change'),
 
     url(r'^switch/(?P<url>.*)/(?P<action>.*)$', 'conference_switch'),

exposition/admin.py

@@ -24,6 +24,7 @@ from forms import (
 )
 from functions.admin_views import (
     AdminListView,
+    AdminListViewNoThemeMixin,
     AdminView,
     stat_paginate_results,
     upload_photo
@@ -349,6 +350,10 @@ class ExpositionListView(AdminListView):
     model = Exposition
 
 
+class ExpositionListViewNoTheme(AdminListViewNoThemeMixin, ExpositionListView):
+    pass
+
+
 def upload_exposition_photo(request, expo_id):
     return upload_photo(request, expo_id, Exposition)
 

exposition/admin_urls.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from django.conf.urls import patterns, include, url
-from admin import ExpositionListView, ExpositionView
+from admin import ExpositionListView, ExpositionView, ExpositionListViewNoTheme
 
 urlpatterns = patterns('exposition.admin',
     url(r'^upload-photo/(?P<expo_id>.*)/$', 'upload_exposition_photo'),
@@ -9,7 +9,9 @@ urlpatterns = patterns('exposition.admin',
     #url(r'^add.*/$', 'exposition_add'),
     url(r'^delete/(?P<url>.*)/$', 'exposition_delete'),
     #url(r'^change/(?P<url>.*)/$', 'exposition_change'),
-    url(r'^all/$', ExpositionListView.as_view()),
+    url(r'^all/$', ExpositionListView.as_view(), name='admin-exposition-all'),
+    url(r'^notheme/$', ExpositionListViewNoTheme.as_view(), name='admin-exposition-notheme'),
+
     url(r'^switch/(?P<url>.*)/(?P<action>.*)$', 'exposition_switch'),
     #url(r'^copy/(?P<url>.*)$', 'exposition_copy'),
     url(r'^search/$', 'search_expo'),

functions/admin_views.py

@@ -131,16 +131,38 @@ class AdminListView(FormView):
         context.update({'object_list': result})
         return self.render_to_response(context)
 
-    def get_context_data(self, **kwargs):
+    def get_queryset(self):
-        context = super(AdminListView, self).get_context_data(**kwargs)
         if issubclass(self.model, TranslatableModel):
-            qs = self.model.objects.language().all().order_by('name')
+            return self.model.objects.language().all().order_by('name')
         else:
-            qs = self.model.objects.all().order_by('-modified')
+            return self.model.objects.all().order_by('-modified')
+
+    def get_context_data(self, **kwargs):
+        context = super(AdminListView, self).get_context_data(**kwargs)
+        qs = self.get_queryset()
         result = self.paginate_func(qs, page=self.request.GET.get('page'))
         context['object_list'] = result
         return context
 
+
+class AdminListViewNoThemeMixin(object):
+    def get_queryset(self):
+        return self.model.objects.language().filter(theme__isnull=True).order_by('name')
+
+    def form_valid(self, form):
+        qs = form.filter()
+        qs = qs.filter(theme__isnull=True)
+        result = self.paginate_func(qs, page=self.request.GET.get('page'))
+        context = self.get_context_data(form=form)
+        context.update({'object_list': result})
+        return self.render_to_response(context)
+
+    def get_context_data(self, **kwargs):
+        context = super(AdminListViewNoThemeMixin, self).get_context_data(**kwargs)
+        context.update({'notheme': True})
+        return context
+
+
 def upload_photo(request, id, Model):
     """
     uploading photo to some instance of Model

proj/views.py

@@ -86,8 +86,8 @@ class MainPageView(JitterCacheMixin, TemplateView):
         # update main_page counter
         for event in events:
             event.main.link.log(self.request, 1)
-        exposition_themes = Theme.objects.language().filter(main_page=True).order_by('-main_page').filter(types=Theme.types.exposition)[:6]
+        exposition_themes = Theme.objects.language().filter(main_page=True, types=Theme.types.exposition)[:6]
-        conference_themes = Theme.objects.language().filter(main_page=True).order_by('-main_page').filter(types=Theme.types.conference)[:6]
+        conference_themes = Theme.objects.language().filter(main_page=True, types=Theme.types.conference)[:6]
 
         args = {'events': events, 'exposition_themes': exposition_themes, 'conference_themes': conference_themes,
                 'search_form': ExpositionSearchForm, 'search_action': '/expo/search/',

templates/admin/conference/conference_list.html

@@ -20,6 +20,8 @@ td a{
     <div class="box-header well">
         <h2><i class="icon-arrow-down"></i>{% trans "Фильтры" %}</h2>
     </div>
+
+    <div class="span4" style="margin-left: 0px;">
         <div class="box-content">
             <form>
                 {{ form }}
@@ -27,6 +29,17 @@ td a{
                 <button type="submit" class="btn">{% trans "Найти" %}</button>
             </form>
         </div>
+    </div>
+
+    <div class="span4" style="margin-left: 0px;">
+        <div class="box-content">
+            {% if notheme %}
+                <a class="btn-small btn-success" href="{% url 'admin-conference-all' %}">Отобразить все события</a>
+            {% else %}
+                <a class="btn-small btn-danger" href="{% url 'admin-conference-notheme' %}">Отобразить события с пустыми темами</a>
+            {% endif %}
+        </div>
+    </div>
 
 </div>
 

templates/admin/expobanner/comment_list.html

@@ -32,6 +32,6 @@
         {% endblock %}
     </div>
     {# pagination #}
-    {% include 'admin/includes/admin_pagination.html' with page_obj=page_obj %}
+    {% include 'admin/includes/admin_pagination.html' with page_obj=object_list %}
 </div>
 {% endblock %}

templates/admin/expobanner/pcomment_list.html

@@ -32,6 +32,6 @@
         {% endblock %}
     </div>
     {# pagination #}
-    {% include 'admin/includes/admin_pagination.html' with page_obj=page_obj %}
+    {% include 'admin/includes/admin_pagination.html' with page_obj=object_list %}
 </div>
 {% endblock %}

templates/admin/exposition/exposition_list.html

@@ -19,6 +19,8 @@ td a{
     <div class="box-header well">
         <h2><i class="icon-arrow-down"></i>{% trans "Фильтры" %}</h2>
     </div>
+
+    <div class="span4" style="margin-left: 0px;">
         <div class="box-content">
             <form>
                 {{ form }}
@@ -26,8 +28,20 @@ td a{
                 <button type="submit" class="btn">{% trans "Найти" %}</button>
             </form>
         </div>
+    </div>
 
+    <div class="span4" style="margin-left: 0px;">
+        <div class="box-content">
+            {% if notheme %}
+                <a class="btn-small btn-success" href="{% url 'admin-exposition-all' %}">Отобразить все события</a>
+            {% else %}
+                <a class="btn-small btn-danger" href="{% url 'admin-exposition-notheme' %}">Отобразить события с пустыми темами</a>
+            {% endif %}
+        </div>
     </div>
+
+</div>
+
 <div class="box span8">
     <div class="box-header well">
         <h2><i class="icon-arrow-down"></i>{% trans "Список выставок" %}</h2>

templates/admin/place_conference/place_conference_list.html

@@ -1,16 +1,17 @@
 {% extends 'admin_list.html' %}
+{% load i18n %}
 
 {% block body %}
 
 <div class="box span8">
     <div class="box-header well">
-        <h2><i class="icon-arrow-down"></i>Фильтры</h2>
+        <h2><i class="icon-arrow-down"></i>{% trans "Фильтры" %}</h2>
     </div>
     <div class="box-content">
         <form>
             {{ form }}
 
-            <button type="submit" class="btn">Найти</button>
+            <button type="submit" class="btn">{% trans "Найти" %}</button>
         </form>
     </div>
 
@@ -18,16 +19,16 @@
 
 <div class="box span8">
     <div class="box-header well">
-        <h2><i class="icon-arrow-down"></i>Места проведения конференций</h2>
+        <h2><i class="icon-arrow-down"></i>{% trans "Места проведения конференций" %}</h2>
     </div>
     <div class="box-content">
 
         <table class="table table-hover">
 			<thead>
 			<tr>
-			  <th>Название</th>
+			  <th>{% trans "Название" %}</th>
-			  <th>Страна</th>
+			  <th>{% trans "Страна" %}</th>
-			  <th>Город</th>
+			  <th>{% trans "Город" %}</th>
 			  <th>&nbsp;</th>
 			</tr>
 			</thead>
@@ -39,24 +40,24 @@
 			  <td>{% ifnotequal item.city None %}{{ item.city }} {% endifnotequal %}</td>
 			  <td class="center sorting_1">
                   <a class="btn-small btn-info" href="/admin/place_conference/{{ item.url|lower }}/">
-                  Изменить
+                  {% trans "Изменить" %}
                   </a>
               </td>
               <td class="center sorting_1">
                   <a class="btn-small btn-inverse" href="/admin/place_conference/copy/{{ item.url|lower }}">
-                   Копировать
+                   {% trans "Копировать" %}
                   </a>
               </td>
               <td>
                   <a class="btn-small btn-danger" href="/admin/place_conference/delete/{{ item.url|lower }}">
-                  Удалить
+                  {% trans "Удалить" %}
                   </a>
               </td>
 			</tr>
           {% endfor %}
 		  </tbody>
 	</table>
-    <a class="btn btn-success" href="/admin/place_conference/add"><i class="icon-plus-sign icon-white"></i> Добавить конферец зал</a>
+    <a class="btn btn-success" href="/admin/place_conference/add"><i class="icon-plus-sign icon-white"></i> {% trans "Добавить конферец зал" %}</a>
     </div>
     {# pagination #}
     {% include 'admin/includes/admin_pagination.html' with page_obj=object_list %}

templates/admin/redirects/list.html

@@ -32,6 +32,6 @@
         {% endblock %}
     </div>
     {# pagination #}
-    {% include 'admin/includes/admin_pagination.html' with page_obj=page_obj %}
+    {% include 'admin/includes/admin_pagination.html' with page_obj=object_list %}
 </div>
 {% endblock %}

templates/client/includes/conference/conference_object.html

@@ -353,19 +353,26 @@
 	</div>
 	{% endif %}
     {% include 'client/includes/banners/detail_inner_3.html' %}
+
 	<div class="e-cat look-also">
 		<h2 class="sect-title">{% trans 'Смотрите также:' %}</h2>
 		<a href="{{ event.catalog }}city/{{ event.city.url }}/">{% trans "Конференции" %} {% if request.LANGUAGE_CODE == 'ru' and event.city.inflect %}{{ event.city.inflect }}{% else %}{% trans 'in' %} {{ event.city.name }}{% endif %}</a>
 		<a href="{{ event.catalog }}country/{{ event.country.url }}/">{% trans "Конференции" %} {% if request.LANGUAGE_CODE == 'ru'  and event.country.inflect %}{{ event.country.inflect }}{% else %}{% trans 'in' %} {{ event.country.name }}{% endif %}</a>
+		{% if event.theme.all %}
 			<a href="{{ event.catalog }}theme/{{ event.theme.all.0.url }}/country/{{ event.country.url }}/">{% trans "Конференции по тематике " %}&laquo;{{ event.theme.all.0.name|capfirst }}&raquo; {% if request.LANGUAGE_CODE == 'ru' and event.country.inflect %}{{ event.country.inflect }}{% else %}{% trans 'in' %} {{ event.country.name }}{% endif %}</a>
 			<a href="{{ event.catalog }}theme/{{ event.theme.all.0.url }}/city/{{ event.city.url }}/">{% trans "Конференции по тематике " %}&laquo;{{ event.theme.all.0.name|capfirst }}&raquo; {% if request.LANGUAGE_CODE == 'ru' and event.city.inflect %}{{ event.city.inflect }}{% else %}{% trans 'in' %} {{ event.city.name }}{% endif %}</a>
+		{% endif %}
 	</div>
+
 {% endblock %}
+
 {% block content_text %}
 {% endblock %}
+
 {% block popup %}
 	{% include 'client/popups/advertise_member.html' with form=advertising_form %}
 {% endblock %}
+
 {% block scripts %}
 	{% if request.GET.debug == '1' %}
 	<script src="{% static 'client/js/_modules/page.exposition.object.js' %}"></script>

templates/client/includes/conference/conference_paid.html

@@ -388,13 +388,17 @@
 	</div>
 	{% endif %}
     {% include 'client/includes/banners/detail_inner_3.html' %}
+
 	<div class="e-cat look-also">
 		<h2 class="sect-title">{% trans 'Смотрите также:' %}</h2>
 		<a href="{{ event.catalog }}city/{{ event.city.url }}/">{% trans "Конференции" %} {% if request.LANGUAGE_CODE == 'ru' and event.city.inflect %}{{ event.city.inflect }}{% else %}{% trans 'in' %} {{ event.city.name }}{% endif %}</a>
 		<a href="{{ event.catalog }}country/{{ event.country.url }}/">{% trans "Конференции" %} {% if request.LANGUAGE_CODE == 'ru'  and event.country.inflect %}{{ event.country.inflect }}{% else %}{% trans 'in' %} {{ event.country.name }}{% endif %}</a>
+		{% if event.theme.all %}
 			<a href="{{ event.catalog }}theme/{{ event.theme.all.0.url }}/country/{{ event.country.url }}/">{% trans "Конференции по тематике " %}&laquo;{{ event.theme.all.0.name|capfirst }}&raquo; {% if request.LANGUAGE_CODE == 'ru' and event.country.inflect %}{{ event.country.inflect }}{% else %}{% trans 'in' %} {{ event.country.name }}{% endif %}</a>
 			<a href="{{ event.catalog }}theme/{{ event.theme.all.0.url }}/city/{{ event.city.url }}/">{% trans "Конференции по тематике " %}&laquo;{{ event.theme.all.0.name|capfirst }}&raquo; {% if request.LANGUAGE_CODE == 'ru' and event.city.inflect %}{{ event.city.inflect }}{% else %}{% trans 'in' %} {{ event.city.name }}{% endif %}</a>
+		{% endif %}
 	</div>
+	
 {% endblock %}
 
 {% block content_text %}

templates/client/includes/exposition/expo_paid.html

@@ -372,12 +372,15 @@
             </ul>
         </div>
         {% endif %}
+    
     <div class="e-cat look-also">
         <h2 class="sect-title">{% trans 'Смотрите также:' %}</h2>
         <a href="{{ exposition.catalog }}city/{{ exposition.city.url }}/">{% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %}</a>
         <a href="{{ exposition.catalog }}country/{{ exposition.country.url }}/">{% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %}</a>
+        {% if exposition.theme.all %}
             <a href="{{ exposition.catalog }}theme/{{ exposition.theme.all.0.url }}/country/{{ exposition.country.url }}/">{% trans "Выставки по тематике " %}&laquo;{{ exposition.theme.all.0.name|capfirst }}&raquo; {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %}</a>
             <a href="{{ exposition.catalog }}theme/{{ exposition.theme.all.0.url }}/city/{{ exposition.city.url }}/">{% trans "Выставки по тематике " %}&laquo;{{ exposition.theme.all.0.name|capfirst }}&raquo; {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %}</a>
+        {% endif %}
     </div>
 
 {% endblock %}

templates/client/includes/exposition/exposition_object.html

@@ -382,15 +382,20 @@
 		<h2 class="sect-title">{% trans 'Смотрите также:' %}</h2>
 		<a href="{{ exposition.catalog }}city/{{ exposition.city.url }}/">{% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %}</a>
 		<a href="{{ exposition.catalog }}country/{{ exposition.country.url }}/">{% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %}</a>
+		{% if exposition.theme.all %}
 			<a href="{{ exposition.catalog }}theme/{{ exposition.theme.all.0.url }}/country/{{ exposition.country.url }}/">{% trans "Выставки по тематике " %}&laquo;{{ exposition.theme.all.0.name|capfirst }}&raquo; {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %}</a>
 			<a href="{{ exposition.catalog }}theme/{{ exposition.theme.all.0.url }}/city/{{ exposition.city.url }}/">{% trans "Выставки по тематике " %}&laquo;{{ exposition.theme.all.0.name|capfirst }}&raquo; {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %}</a>
+		{% endif %}
 	</div>
 {% endblock %}
+
 {% block content_text %}
 {% endblock %}
+
 {% block popup %}
 	{% include 'client/popups/advertise_member.html' with form=advertising_form %}
 {% endblock %}
+
 {% block scripts %}
 	{% if request.GET.debug == '1' %}
 	<script src="{% static 'client/js/_modules/page.exposition.object.js' %}"></script>