Create views 'objects_list' and 'filtered_list'. Add this views to all modules

remotes/origin/1203
Nazar Kotjuk 12 years ago
parent ce4820335b
commit 073150e432
  1. 10
      accounts/templates/translators.html
  2. 10
      accounts/templates/user_all.html
  3. 32
      accounts/views.py
  4. 10
      article/templates/article_all.html
  5. 16
      article/views.py
  6. 10
      city/templates/city_all.html
  7. 21
      city/views.py
  8. 14
      company/templates/company_all.html
  9. 17
      company/views.py
  10. 14
      conference/templates/conference_all.html
  11. 18
      conference/views.py
  12. 20
      country/tamplates/country_all.html
  13. 20
      country/views.py
  14. 14
      exposition/templates/exposition_all.html
  15. 20
      exposition/views.py
  16. 45
      functions/custom_views.py
  17. 13
      news/templates/news_all.html
  18. 13
      news/views.py
  19. 15
      organiser/templates/organiser_all.html
  20. 19
      organiser/views.py
  21. 13
      place_conference/templates/place_conference_all.html
  22. 21
      place_conference/views.py
  23. 13
      place_exposition/templates/place_exposition_all.html
  24. 20
      place_exposition/views.py
  25. 14
      seminar/templates/seminar_all.html
  26. 20
      seminar/views.py
  27. 13
      service/templates/review_all.html
  28. 13
      service/templates/service_all.html
  29. 28
      service/views.py
  30. 21
      theme/templates/tag_all.html
  31. 20
      theme/templates/theme_all.html
  32. 27
      theme/views.py
  33. 14
      webinar/templates/webinar_all.html
  34. 20
      webinar/views.py

@ -17,7 +17,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for item in users %} {% for item in objects %}
<tr> <tr>
<td>{{ item.id }}</td> <td>{{ item.id }}</td>
@ -44,12 +44,12 @@
{# pagination #} {# pagination #}
<div class="pagination pagination-centered"> <div class="pagination pagination-centered">
<ul> <ul>
{% if users.has_previous %} {% if objects.has_previous %}
<li> <a href="?page={{ users.previous_page_number }}"></a></li> <li> <a href="?page={{ objects.previous_page_number }}"></a></li>
{% endif %} {% endif %}
{% if users.has_next %} {% if objects.has_next %}
<li><a href="?page={{ users.next_page_number }}"></a></li> <li><a href="?page={{ objects.next_page_number }}"></a></li>
{% endif %} {% endif %}
</ul> </ul>
</div> </div>

@ -20,7 +20,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for item in users %} {% for item in objects %}
<tr> <tr>
<td>{{ item.id }}</td> <td>{{ item.id }}</td>
@ -52,12 +52,12 @@
{# pagination #} {# pagination #}
<div class="pagination pagination-centered"> <div class="pagination pagination-centered">
<ul> <ul>
{% if users.has_previous %} {% if objects.has_previous %}
<li> <a href="?page={{ users.previous_page_number }}"></a></li> <li> <a href="?page={{ objects.previous_page_number }}"></a></li>
{% endif %} {% endif %}
{% if users.has_next %} {% if objects.has_next %}
<li><a href="?page={{ users.next_page_number }}"></a></li> <li><a href="?page={{ objects.next_page_number }}"></a></li>
{% endif %} {% endif %}
</ul> </ul>
</div> </div>

@ -2,50 +2,28 @@
from django.shortcuts import render_to_response from django.shortcuts import render_to_response
from django.http import HttpResponseRedirect, HttpResponse from django.http import HttpResponseRedirect, HttpResponse
from django.core.context_processors import csrf from django.core.context_processors import csrf
from django.conf import settings
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.core.mail import send_mail
from django.core.paginator import Paginator, PageNotAnInteger, EmptyPage
#models and forms #models and forms
from models import User from models import User
from forms import UserForm, UserCreationForm, TranslatorForm from forms import UserForm, UserCreationForm, TranslatorForm
#custom views
from functions.custom_views import objects_list, filtered_list
from hashlib import md5 from hashlib import md5
@login_required
def user_all(request): def user_all(request):
""" """
Return list of all users with pagination Return list of all users with pagination
""" """
user_list = User.objects.all() return objects_list(request, User, 'user_all.html')
paginator = Paginator(user_list, 10)#show 10 items per page
page = request.GET.get('page')
try:
users = paginator.page(page)
except PageNotAnInteger:
# If page is not an integer, deliver first page.
users = paginator.page(1)
except EmptyPage:
# If page is out of range (e.g. 9999), deliver last page of results.
users = paginator.page(paginator._num_pages)
return render_to_response('user_all.html', {'users': users})
def translators(request): def translators(request):
""" """
Return list of user filtered by "is_translator" field (list of translators) Return list of user filtered by "is_translator" field (list of translators)
""" """
user_list = User.objects.filter(is_translator='True') user_list = User.objects.filter(is_translator='True')
paginator = Paginator(user_list, 10)#show 10 items per page return filtered_list(request, user_list, 'translators.html')
page = request.GET.get('page')
try:
users = paginator.page(page)
except PageNotAnInteger:
# If page is not an integer, deliver first page.
users = paginator.page(1)
except EmptyPage:
# If page is out of range (e.g. 9999), deliver last page of results.
users = paginator.page(paginator._num_pages)
return render_to_response('translators.html', {'users': users})
def translator_change(request, user_id): def translator_change(request, user_id):

@ -20,7 +20,7 @@ Displays lists of all articles in the table
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for item in articles %} {% for item in objects %}
<tr> <tr>
<td>{{ item.id }}</td> <td>{{ item.id }}</td>
<td>{{ item.main_title }}</td> <td>{{ item.main_title }}</td>
@ -39,12 +39,12 @@ Displays lists of all articles in the table
<div class="pagination pagination-centered"> <div class="pagination pagination-centered">
<ul> <ul>
{% if articles.has_previous %} {% if objects.has_previous %}
<li> <a href="?page={{ articles.previous_page_number }}"></a></li> <li> <a href="?page={{ objects.previous_page_number }}"></a></li>
{% endif %} {% endif %}
{% if articles.has_next %} {% if objects.has_next %}
<li><a href="?page={{ articles.next_page_number }}"></a></li> <li><a href="?page={{ objects.next_page_number }}"></a></li>
{% endif %} {% endif %}
</ul> </ul>
</div> </div>

@ -5,7 +5,6 @@ from django.core.context_processors import csrf
from django.conf import settings from django.conf import settings
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.core.paginator import Paginator, PageNotAnInteger, EmptyPage
#models and forms #models and forms
from forms import ArticleForm, Article, ArticleChangeForm from forms import ArticleForm, Article, ArticleChangeForm
from theme.models import Tag from theme.models import Tag
@ -13,6 +12,8 @@ from file.models import FileModel, TmpFile
from file.forms import FileModelForm from file.forms import FileModelForm
#pythom #pythom
import random import random
#custom views
from functions.custom_views import objects_list
@login_required @login_required
@ -55,18 +56,7 @@ def article_all(request):
""" """
Return list of all articles with pagination Return list of all articles with pagination
""" """
article_list = Article.objects.all() return objects_list(request, Article, 'article_all.html')
paginator = Paginator(article_list, 1)#show 10 items per page
page = request.GET.get('page')
try:
articles = paginator.page(page)
except PageNotAnInteger:
# If page is not an integer, deliver first page.
articles = paginator.page(1)
except EmptyPage:
# If page is out of range (e.g. 9999), deliver last page of results.
articles = paginator.page(paginator._num_pages)
return render_to_response('article_all.html', {'articles': articles})

@ -20,7 +20,7 @@ Displays lists of all cities in the table
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for item in cities %} {% for item in objects %}
<tr> <tr>
<td>{{ item.id }}</td> <td>{{ item.id }}</td>
<td>{{ item.name }}</td> <td>{{ item.name }}</td>
@ -39,12 +39,12 @@ Displays lists of all cities in the table
<div class="pagination pagination-centered"> <div class="pagination pagination-centered">
<ul> <ul>
{% if cities.has_previous %} {% if objects.has_previous %}
<li> <a href="?page={{ cities.previous_page_number }}"></a></li> <li> <a href="?page={{ objects.previous_page_number }}"></a></li>
{% endif %} {% endif %}
{% if cities.has_next %} {% if objects.has_next %}
<li><a href="?page={{ cities.next_page_number }}"></a></li> <li><a href="?page={{ objects.next_page_number }}"></a></li>
{% endif %} {% endif %}
</ul> </ul>
</div> </div>

@ -5,7 +5,6 @@ from django.core.context_processors import csrf
from django.conf import settings from django.conf import settings
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.core.paginator import Paginator, PageNotAnInteger, EmptyPage
#models and forms #models and forms
from forms import CityForm, CityChangeForm from forms import CityForm, CityChangeForm
from models import City from models import City
@ -13,27 +12,15 @@ from file.models import FileModel, TmpFile
from file.forms import FileModelForm from file.forms import FileModelForm
#python #python
import random import random
#custom views
from functions.custom_views import objects_list
@login_required
def city_all(request): def city_all(request):
""" """
Return list of all cities with pagination return list of all cities with pagination
""" """
return objects_list(request, City, 'city_all.html', 1)
cities_list = City.objects.all()
paginator = Paginator(cities_list, 2)#show 2 items per page
page = request.GET.get('page')
try:
cities = paginator.page(page)
except PageNotAnInteger:
# If page is not an integer, deliver first page.
cities = paginator.page(1)
except EmptyPage:
# If page is out of range (e.g. 9999), deliver last page of results.
cities = paginator.page(paginator._num_pages)
return render_to_response('city_all.html', {'cities' : cities})
@login_required @login_required
def city_add(request): def city_add(request):

@ -20,7 +20,7 @@ Displays lists of all companies in the table
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for item in companies %} {% for item in objects %}
<tr> <tr>
<td>{{ item.id }}</td> <td>{{ item.id }}</td>
<td>{{ item.name }}</td> <td>{{ item.name }}</td>
@ -35,7 +35,19 @@ Displays lists of all companies in the table
</tbody> </tbody>
</table> </table>
<a class="btn btn-success" href="/company/add"><i class="icon-plus-sign icon-white"></i> Добавить компанию</a> <a class="btn btn-success" href="/company/add"><i class="icon-plus-sign icon-white"></i> Добавить компанию</a>
{# pagination #}
<div class="pagination pagination-centered">
<ul>
{% if objects.has_previous %}
<li> <a href="?page={{ objects.previous_page_number }}"></a></li>
{% endif %}
{% if objects.has_next %}
<li><a href="?page={{ objects.next_page_number }}"></a></li>
{% endif %}
</ul>
</div> </div>
</div>
{% endblock %} {% endblock %}

@ -14,6 +14,15 @@ from file.models import FileModel, TmpFile
from file.forms import FileModelForm from file.forms import FileModelForm
#python #python
import random import random
#custom views
from functions.custom_views import objects_list
def company_all(request):
"""
Return list of all companies with pagination
"""
return objects_list(request, Company, 'company_all.html')
@login_required @login_required
@ -118,10 +127,4 @@ def company_change(request, company_id):
return render_to_response('company_add.html', args) return render_to_response('company_add.html', args)
@login_required
def company_all(request):
"""
Return list of all companies
"""
companies = Company.objects.all()
return render_to_response('company_all.html', {'companies':companies})

@ -17,7 +17,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for item in conferences %} {% for item in objects %}
<tr> <tr>
<td>{{ item.id }}</td> <td>{{ item.id }}</td>
@ -37,5 +37,17 @@
</table> </table>
<a class="btn btn-success" href="/conference/add"><i class="icon-plus-sign icon-white"></i> Добавить конференцию</a> <a class="btn btn-success" href="/conference/add"><i class="icon-plus-sign icon-white"></i> Добавить конференцию</a>
</div> </div>
{# pagination #}
<div class="pagination pagination-centered">
<ul>
{% if objects.has_previous %}
<li> <a href="?page={{ objects.previous_page_number }}"></a></li>
{% endif %}
{% if objects.has_next %}
<li><a href="?page={{ objects.next_page_number }}"></a></li>
{% endif %}
</ul>
</div>
</div> </div>
{% endblock %} {% endblock %}

@ -7,7 +7,7 @@ from django.forms.formsets import BaseFormSet, formset_factory
from django.forms.models import modelformset_factory from django.forms.models import modelformset_factory
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
# #models and forms
from models import Conference, TimeTable from models import Conference, TimeTable
from forms import ConferenceChangeForm, ConferenceCreateForm, TimeTableForm from forms import ConferenceChangeForm, ConferenceCreateForm, TimeTableForm
from theme.models import Tag from theme.models import Tag
@ -16,6 +16,15 @@ from file.models import FileModel, TmpFile
from file.forms import FileModelForm from file.forms import FileModelForm
#python #python
import random import random
#custom views
from functions.custom_views import objects_list
def conference_all(request):
"""
Return list of all conferences with pagination
"""
return objects_list(request, Conference, 'conference_all.html')
@login_required @login_required
@ -130,10 +139,3 @@ def conference_change(request, url):
return render_to_response('conference_add.html', args) return render_to_response('conference_add.html', args)
@login_required
def conference_all(request):
"""
Return list of all conferences
"""
conferences = Conference.objects.all()
return render_to_response('conference_all.html', {'conferences':conferences})

@ -22,7 +22,7 @@ Displays lists of all countries in the table
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for item in countries %} {% for item in objects %}
<tr> <tr>
<td>{{ item.id }}</td> <td>{{ item.id }}</td>
<td>{{ item.name }}</td> <td>{{ item.name }}</td>
@ -43,26 +43,26 @@ Displays lists of all countries in the table
<ul> <ul>
{% if countries.has_previous %} {% if objects.has_previous %}
<li> <a href="?page={{ countries.previous_page_number }}"></a></li> <li> <a href="?page={{ objects.previous_page_number }}"></a></li>
{% endif %} {% endif %}
{% if countries.has_next %} {% if objects.has_next %}
<li><a href="?page={{ countries.next_page_number }}"></a></li> <li><a href="?page={{ objects.next_page_number }}"></a></li>
{% endif %} {% endif %}
</ul> </ul>
<!-- <!--
<span class="step-links"> <span class="step-links">
{% if countries.has_previous %} {% if objects.has_previous %}
<a href="?page={{ countries.previous_page_number }}">previous</a> <a href="?page={{ objects.previous_page_number }}">previous</a>
{% endif %} {% endif %}
<span class="current"> <span class="current">
Page {{ countries.number }} of {{ countries.paginator.num_pages }}. Page {{ objects.number }} of {{ objects.paginator.num_pages }}.
</span> </span>
{% if countries.has_next %} {% if objects.has_next %}
<a href="?page={{ countries.next_page_number }}">next</a> <a href="?page={{ objects.next_page_number }}">next</a>
{% endif %} {% endif %}
</span> </span>
</div> --> </div> -->

@ -6,6 +6,7 @@ from django.conf import settings
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.db.models.loading import get_model from django.db.models.loading import get_model
from django.core.paginator import Paginator, PageNotAnInteger, EmptyPage
#models and forms #models and forms
from models import Country from models import Country
from forms import CountryForm, CountryChangeForm from forms import CountryForm, CountryChangeForm
@ -13,28 +14,13 @@ from file.models import FileModel, TmpFile
from file.forms import FileModelForm from file.forms import FileModelForm
#python #python
import random import random
from functions.custom_views import objects_list
from django.core.paginator import Paginator, PageNotAnInteger, EmptyPage
@login_required
def country_all(request): def country_all(request):
""" """
Return list of all countries with pagination Return list of all countries with pagination
""" """
country_list = Country.objects.all() return objects_list(request, Country, 'country_all.html', 1)
paginator = Paginator(country_list, 2)#show 2 item per page
page = request.GET.get('page')
try:
countries = paginator.page(page)
except PageNotAnInteger:
# If page is not an integer, deliver first page.
countries = paginator.page(1)
except EmptyPage:
# If page is out of range (e.g. 9999), deliver last page of results.
countries = paginator.page(paginator._num_pages)
return render_to_response('country_all.html', {'countries' : countries})
@login_required @login_required
def country_add(request): def country_add(request):

@ -17,7 +17,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for item in expositions%} {% for item in objects %}
<tr> <tr>
<td>{{ item.id }}</td> <td>{{ item.id }}</td>
@ -37,5 +37,17 @@
</table> </table>
<a class="btn btn-success" href="/exposition/add"><i class="icon-plus-sign icon-white"></i> Добавить выставку</a> <a class="btn btn-success" href="/exposition/add"><i class="icon-plus-sign icon-white"></i> Добавить выставку</a>
</div> </div>
{# pagination #}
<div class="pagination pagination-centered">
<ul>
{% if objects.has_previous %}
<li> <a href="?page={{ objects.previous_page_number }}"></a></li>
{% endif %}
{% if objects.has_next %}
<li><a href="?page={{ objects.next_page_number }}"></a></li>
{% endif %}
</ul>
</div>
</div> </div>
{% endblock %} {% endblock %}

@ -7,7 +7,7 @@ from django.forms.formsets import BaseFormSet, formset_factory
from django.forms.models import modelformset_factory from django.forms.models import modelformset_factory
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
# #models and forms
from models import Exposition, TimeTable from models import Exposition, TimeTable
from forms import ExpositionChangeForm, ExpositionCreateForm, TimeTableForm from forms import ExpositionChangeForm, ExpositionCreateForm, TimeTableForm
from theme.models import Tag from theme.models import Tag
@ -16,6 +16,15 @@ from file.models import FileModel, TmpFile
from file.forms import FileModelForm from file.forms import FileModelForm
#python #python
import random import random
#custom views
from functions.custom_views import objects_list
def exposition_all(request):
"""
Return list of all expositions with pagination
"""
return objects_list(request, Exposition, 'exposition_all.html')
@login_required @login_required
@ -131,12 +140,3 @@ def exposition_change(request, url):
args['obj_id'] = getattr(exposition, 'id') args['obj_id'] = getattr(exposition, 'id')
return render_to_response('exposition_add.html', args) return render_to_response('exposition_add.html', args)
@login_required
def exposition_all(request):
"""
Return list of all expositions
"""
expositions = Exposition.objects.all()
return render_to_response('exposition_all.html', {'expositions':expositions})

@ -1,11 +1,48 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.shortcuts import render_to_response from django.shortcuts import render_to_response
from django.http import HttpResponseRedirect, HttpResponse
from django.core.context_processors import csrf
from django.conf import settings
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.core.mail import send_mail
from django.core.paginator import Paginator, PageNotAnInteger, EmptyPage from django.core.paginator import Paginator, PageNotAnInteger, EmptyPage
@login_required
def objects_list(request, Model, template, item_per_page=10):
"""
Return template with all objects of model Model
Model - objects Model
item_per_page - how many objects view in the one page
"""
list = Model.objects.all()
paginator = Paginator(list, item_per_page)
page = request.GET.get('page')
try:
objects = paginator.page(page)
except PageNotAnInteger:
# If page is not an integer, deliver first page.
objects = paginator.page(1)
except EmptyPage:
# If page is out of range (e.g. 9999), deliver last page of results.
objects = paginator.page(paginator._num_pages)
return render_to_response(template, {'objects': objects})
@login_required
def filtered_list(request, objects, template, item_per_page=10):
"""
Return template with objects in it with pagination
item_per_page - how many objects view in the one page
"""
paginator = Paginator(objects, item_per_page)
page = request.GET.get('page')
try:
objects = paginator.page(page)
except PageNotAnInteger:
# If page is not an integer, deliver first page.
objects = paginator.page(1)
except EmptyPage:
# If page is out of range (e.g. 9999), deliver last page of results.
objects = paginator.page(paginator._num_pages)
return render_to_response(template, {'objects': objects})

@ -21,7 +21,7 @@ Displays lists of all news in the table
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for item in news %} {% for item in objects %}
<tr> <tr>
<td>{{ item.id }}</td> <td>{{ item.id }}</td>
<td>{{ item.date }}</td> <td>{{ item.date }}</td>
@ -38,19 +38,18 @@ Displays lists of all news in the table
</table> </table>
<a class="btn btn-success" href="/news/add"><i class="icon-plus-sign icon-white"></i> Добавить новость</a> <a class="btn btn-success" href="/news/add"><i class="icon-plus-sign icon-white"></i> Добавить новость</a>
</div> </div>
{% comment %} {# pagination #}
<div class="pagination pagination-centered"> <div class="pagination pagination-centered">
<ul> <ul>
{% if cities.has_previous %} {% if objects.has_previous %}
<li> <a href="?page={{ cities.previous_page_number }}"></a></li> <li> <a href="?page={{ objects.previous_page_number }}"></a></li>
{% endif %} {% endif %}
{% if cities.has_next %} {% if objects.has_next %}
<li><a href="?page={{ cities.next_page_number }}"></a></li> <li><a href="?page={{ objects.next_page_number }}"></a></li>
{% endif %} {% endif %}
</ul> </ul>
</div> </div>
{% endcomment %}
</div> </div>
{% endblock %} {% endblock %}

@ -17,18 +17,15 @@ from file.models import FileModel, TmpFile
from file.forms import FileModelForm from file.forms import FileModelForm
#python #python
import random import random
#custom views
from functions.custom_views import objects_list
@login_required
def news_all(request): def news_all(request):
""" """
Return list of all news Return list of all news with pagination
""" """
news = News.objects.all() return objects_list(request, News, 'news_all.html')
args = {}
args['news'] = news
return render_to_response('news_all.html', args)
@login_required @login_required

@ -19,7 +19,7 @@ Displays lists of all organisers in the table
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for item in organisers %} {% for item in objects %}
<tr> <tr>
<td>{{ item.id }}</td> <td>{{ item.id }}</td>
<td>{{ item.name }}</td> <td>{{ item.name }}</td>
@ -33,7 +33,20 @@ Displays lists of all organisers in the table
</tbody> </tbody>
</table> </table>
<a class="btn btn-success" href="/organiser/add"><i class="icon-plus-sign icon-white"></i> Добавить организатора</a> <a class="btn btn-success" href="/organiser/add"><i class="icon-plus-sign icon-white"></i> Добавить организатора</a>
</div>
{# pagination #}
<div class="pagination pagination-centered">
<ul>
{% if objects.has_previous %}
<li> <a href="?page={{ objects.previous_page_number }}"></a></li>
{% endif %}
{% if objects.has_next %}
<li><a href="?page={{ objects.next_page_number }}"></a></li>
{% endif %}
</ul>
</div> </div>
</div>
{% endblock %} {% endblock %}

@ -14,6 +14,15 @@ from file.models import FileModel, TmpFile
from file.forms import FileModelForm from file.forms import FileModelForm
#python #python
import random import random
#custom functions
from functions.custom_views import objects_list
def organiser_all(request):
"""
Return list of all organisers with pagination
"""
return objects_list(request, Organiser, 'organiser_all.html')
def organiser_add(request): def organiser_add(request):
@ -118,12 +127,4 @@ def organiser_change(request, organiser_id):
object_id=getattr(organiser, 'id')) object_id=getattr(organiser, 'id'))
args['obj_id'] = organiser_id args['obj_id'] = organiser_id
return render_to_response('organiser_add.html', args) return render_to_response('organiser_add.html', args)
def organiser_all(request):
"""
Return list of all organisers
"""
organisers = Organiser.objects.all()
return render_to_response('organiser_all.html', {'organisers':organisers})

@ -19,7 +19,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for item in conferences %} {% for item in objects %}
<tr> <tr>
<td>{{ item.id }}</td> <td>{{ item.id }}</td>
<td>{{ item.name }}</td> <td>{{ item.name }}</td>
@ -37,7 +37,18 @@
</table> </table>
<a class="btn btn-success" href="/place_conference/add"><i class="icon-plus-sign icon-white"></i> Добавить конферец зал</a> <a class="btn btn-success" href="/place_conference/add"><i class="icon-plus-sign icon-white"></i> Добавить конферец зал</a>
</div> </div>
{# pagination #}
<div class="pagination pagination-centered">
<ul>
{% if objects.has_previous %}
<li> <a href="?page={{ objects.previous_page_number }}"></a></li>
{% endif %}
{% if objects.has_next %}
<li><a href="?page={{ objects.next_page_number }}"></a></li>
{% endif %}
</ul>
</div>
</div> </div>

@ -14,11 +14,20 @@ from models import PlaceConference, Hall
from city.models import City from city.models import City
from file.models import FileModel, TmpFile from file.models import FileModel, TmpFile
from file.forms import FileModelForm from file.forms import FileModelForm
#python
import random import random
#custom views
from functions.custom_views import objects_list
# http://stackoverflow.com/questions/2406537/django-formsets-make-first-required/4951032#4951032 def conference_all(request):
"""
Return list of all place_conferences with pagination
"""
return objects_list(request, PlaceConference, 'place_conference_all.html')
# http://stackoverflow.com/questions/2406537/django-formsets-make-first-required/4951032#4951032
@login_required @login_required
def conference_add(request): def conference_add(request):
""" """
@ -153,12 +162,4 @@ def conference_change(request, url):
args['obj_id'] = getattr(place, 'id') args['obj_id'] = getattr(place, 'id')
return render_to_response('place_conference_add.html', args) return render_to_response('place_conference_add.html', args)
@login_required
def conference_all(request):
"""
Return list of all place_conferences
"""
conferences = PlaceConference.objects.all()
return render_to_response('place_conference_all.html', {'conferences': conferences})

@ -19,7 +19,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for item in expositions %} {% for item in objects %}
<tr> <tr>
<td>{{ item.id }}</td> <td>{{ item.id }}</td>
<td>{{ item.name }}</td> <td>{{ item.name }}</td>
@ -37,7 +37,18 @@
</table> </table>
<a class="btn btn-success" href="/place_exposition/add"><i class="icon-plus-sign icon-white"></i> Добавить выставочный центр</a> <a class="btn btn-success" href="/place_exposition/add"><i class="icon-plus-sign icon-white"></i> Добавить выставочный центр</a>
</div> </div>
{# pagination #}
<div class="pagination pagination-centered">
<ul>
{% if objects.has_previous %}
<li> <a href="?page={{ objects.previous_page_number }}"></a></li>
{% endif %}
{% if objects.has_next %}
<li><a href="?page={{ objects.next_page_number }}"></a></li>
{% endif %}
</ul>
</div>
</div> </div>
{% endblock %} {% endblock %}

@ -15,7 +15,17 @@ from models import PlaceExposition, Hall
from city.models import City from city.models import City
from file.models import FileModel, TmpFile from file.models import FileModel, TmpFile
from file.forms import FileModelForm from file.forms import FileModelForm
#python
import random import random
#custom fields
from functions.custom_views import objects_list
def exposition_all(request):
"""
Return list of all place_expositions with pagination
"""
return objects_list(request, PlaceExposition, 'place_exposition_all.html')
@login_required @login_required
@ -158,12 +168,4 @@ def exposition_change(request, url):
args['obj_id'] = exposition_id args['obj_id'] = exposition_id
return render_to_response('place_exposition_add.html', args) return render_to_response('place_exposition_add.html', args)
@login_required
def exposition_all(request):
"""
Return list of all place_expositions
"""
expositions = PlaceExposition.objects.all()
return render_to_response('place_exposition_all.html', {'expositions': expositions})

@ -17,7 +17,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for item in seminars %} {% for item in objects %}
<tr> <tr>
<td>{{ item.id }}</td> <td>{{ item.id }}</td>
@ -37,5 +37,17 @@
</table> </table>
<a class="btn btn-success" href="/seminar/add"><i class="icon-plus-sign icon-white"></i> Добавить семинар</a> <a class="btn btn-success" href="/seminar/add"><i class="icon-plus-sign icon-white"></i> Добавить семинар</a>
</div> </div>
{# pagination #}
<div class="pagination pagination-centered">
<ul>
{% if objects.has_previous %}
<li> <a href="?page={{ objects.previous_page_number }}"></a></li>
{% endif %}
{% if objects.has_next %}
<li><a href="?page={{ objects.next_page_number }}"></a></li>
{% endif %}
</ul>
</div>
</div> </div>
{% endblock %} {% endblock %}

@ -14,6 +14,15 @@ from file.models import FileModel, TmpFile
from file.forms import FileModelForm from file.forms import FileModelForm
#python #python
import random import random
#custom views
from functions.custom_views import objects_list
def seminar_all(request):
"""
Return list of all seminars with pagination
"""
return objects_list(request, Seminar, 'seminar_all.html')
@login_required @login_required
@ -122,13 +131,4 @@ def seminar_change(request, url):
object_id=getattr(seminar, 'id')) object_id=getattr(seminar, 'id'))
args['obj_id'] = getattr(seminar, 'id') args['obj_id'] = getattr(seminar, 'id')
return render_to_response('seminar_add.html', args) return render_to_response('seminar_add.html', args)
@login_required
def seminar_all(request):
"""
Return list of all seminars
"""
seminars = Seminar.objects.all()
return render_to_response('seminar_all.html', {'seminars':seminars})

@ -19,7 +19,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for item in reviews %} {% for item in objects %}
<tr> <tr>
<td>{{ item.id }}</td> <td>{{ item.id }}</td>
<td>{{ item.service }}</td> <td>{{ item.service }}</td>
@ -37,7 +37,18 @@
</table> </table>
</div> </div>
{# pagination #}
<div class="pagination pagination-centered">
<ul>
{% if objects.has_previous %}
<li> <a href="?page={{ objects.previous_page_number }}"></a></li>
{% endif %}
{% if objects.has_next %}
<li><a href="?page={{ objects.next_page_number }}"></a></li>
{% endif %}
</ul>
</div>
</div> </div>
{% endblock %} {% endblock %}

@ -17,7 +17,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for item in services %} {% for item in objects %}
<tr> <tr>
<td>{{ item.id }}</td> <td>{{ item.id }}</td>
<td>{{ item.name }}</td> <td>{{ item.name }}</td>
@ -33,7 +33,18 @@
</table> </table>
<a class="btn btn-success" href="/service/service/add"><i class="icon-plus-sign icon-white"></i> Добавить услугу</a> <a class="btn btn-success" href="/service/service/add"><i class="icon-plus-sign icon-white"></i> Добавить услугу</a>
</div> </div>
{# pagination #}
<div class="pagination pagination-centered">
<ul>
{% if objects.has_previous %}
<li> <a href="?page={{ objects.previous_page_number }}"></a></li>
{% endif %}
{% if objects.has_next %}
<li><a href="?page={{ objects.next_page_number }}"></a></li>
{% endif %}
</ul>
</div>
</div> </div>
{% endblock %} {% endblock %}

@ -8,8 +8,23 @@ from django.contrib.auth.decorators import login_required
#models and forms #models and forms
from models import Service, Review from models import Service, Review
from forms import ServiceForm, ReviewForm from forms import ServiceForm, ReviewForm
from country.models import Country from country.models import Country
#custom views
from functions.custom_views import objects_list
def service_all(request):
"""
return list of all services with pagination
"""
return objects_list(request, Service, 'service_all.html')
def review_all(request):
"""
return list of all reviews with pagination
"""
return objects_list(request, Review, 'review_all.html')
@login_required @login_required
@ -77,10 +92,6 @@ def service_add(request):
return render_to_response('service_add.html', args) return render_to_response('service_add.html', args)
@login_required
def service_all(request):
services = Service.objects.all()
return render_to_response('service_all.html', {'services': services})
@login_required @login_required
def review_add(request): def review_add(request):
@ -122,9 +133,4 @@ def review_change(request, review_id):
args['form'] = form args['form'] = form
args['languages'] = settings.LANGUAGES args['languages'] = settings.LANGUAGES
return render_to_response('review_add.html', args) return render_to_response('review_add.html', args)
@login_required
def review_all(request):
reviews = Review.objects.all()
return render_to_response('review_all.html', {'reviews': reviews})

@ -18,13 +18,13 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for tag in tags %} {% for item in objects %}
<tr> <tr>
<td>{{ tag.id }}</td> <td>{{ item.id }}</td>
<td>{{ tag.name }}</td> <td>{{ item.name }}</td>
<td>{{ tag.theme }}</td> <td>{{ item.theme }}</td>
<td>{{ tag.main_title }}</td> <td>{{ item.main_title }}</td>
<td class="center sorting_1"> <td class="center sorting_1">
<a class="btn btn-info" href="/theme/tag/change/{{ tag.id }}"> <a class="btn btn-info" href="/theme/tag/change/{{ tag.id }}">
@ -38,7 +38,18 @@
</tbody> </tbody>
</table> </table>
<a class="btn btn-success" href="/theme/tag/add"><i class="icon-plus-sign icon-white"></i> Добавить тег</a> <a class="btn btn-success" href="/theme/tag/add"><i class="icon-plus-sign icon-white"></i> Добавить тег</a>
</div>
{# pagination #}
<div class="pagination pagination-centered">
<ul>
{% if objects.has_previous %}
<li> <a href="?page={{ objects.previous_page_number }}"></a></li>
{% endif %}
{% if objects.has_next %}
<li><a href="?page={{ objects.next_page_number }}"></a></li>
{% endif %}
</ul>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

@ -17,12 +17,12 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for theme in themes %} {% for item in objects %}
<tr> <tr>
<td>{{ theme.id }}</td> <td>{{ item.id }}</td>
<td>{{ theme.name }}</td> <td>{{ item.name }}</td>
<td>{{ theme.main_title }}</td> <td>{{ item.main_title }}</td>
<td class="center sorting_1"> <td class="center sorting_1">
<a class="btn btn-info" href="/theme/theme/change/{{ theme.id }}"> <a class="btn btn-info" href="/theme/theme/change/{{ theme.id }}">
@ -37,5 +37,17 @@
</table> </table>
<a class="btn btn-success" href="/theme/theme/add"><i class="icon-plus-sign icon-white"></i> Добавить тематику</a> <a class="btn btn-success" href="/theme/theme/add"><i class="icon-plus-sign icon-white"></i> Добавить тематику</a>
</div> </div>
{# pagination #}
<div class="pagination pagination-centered">
<ul>
{% if objects.has_previous %}
<li> <a href="?page={{ objects.previous_page_number }}"></a></li>
{% endif %}
{% if objects.has_next %}
<li><a href="?page={{ objects.next_page_number }}"></a></li>
{% endif %}
</ul>
</div>
</div> </div>
{% endblock %} {% endblock %}

@ -6,11 +6,20 @@ from django.conf import settings
from django.forms.formsets import BaseFormSet, formset_factory from django.forms.formsets import BaseFormSet, formset_factory
from django.forms.models import modelformset_factory from django.forms.models import modelformset_factory
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.contrib.auth.decorators import login_required
#forms and models
from forms import ThemeForm, TagForm from forms import ThemeForm, TagForm
from models import Theme, Tag from models import Theme, Tag
#custom views
from functions.custom_views import objects_list
from bitfield.types import Bit
from django.contrib.auth.decorators import login_required def theme_all(request):
return objects_list(request, Theme, 'theme_all.html')
def tag_all(request):
return objects_list(request, Tag, 'tag_all.html')
@login_required @login_required
@ -122,16 +131,4 @@ def tag_change(request, tag_id=None):
args['languages'] = settings.LANGUAGES args['languages'] = settings.LANGUAGES
args['tag_id'] = tag_id args['tag_id'] = tag_id
return render_to_response('tag_add.html', args) return render_to_response('tag_add.html', args)
@login_required
def theme_all(request):
themes = Theme.objects.all()
return render_to_response('theme_all.html', {'themes': themes})
@login_required
def tag_all(request):
tags = Tag.objects.all()
return render_to_response('tag_all.html', {'tags': tags})

@ -17,7 +17,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for item in webinars %} {% for item in objects %}
<tr> <tr>
<td>{{ item.id }}</td> <td>{{ item.id }}</td>
@ -37,5 +37,17 @@
</table> </table>
<a class="btn btn-success" href="/webinar/add"><i class="icon-plus-sign icon-white"></i> Добавить вебинар</a> <a class="btn btn-success" href="/webinar/add"><i class="icon-plus-sign icon-white"></i> Добавить вебинар</a>
</div> </div>
{# pagination #}
<div class="pagination pagination-centered">
<ul>
{% if objects.has_previous %}
<li> <a href="?page={{ objects.previous_page_number }}"></a></li>
{% endif %}
{% if objects.has_next %}
<li><a href="?page={{ objects.next_page_number }}"></a></li>
{% endif %}
</ul>
</div>
</div> </div>
{% endblock %} {% endblock %}

@ -13,8 +13,16 @@ from file.models import FileModel, TmpFile
from file.forms import FileModelForm from file.forms import FileModelForm
#python #python
import random import random
#custom views
from functions.custom_views import objects_list
def webinar_all(request):
"""
Return list of all webinars with pagination
"""
return objects_list(request, Webinar, 'webinar_all.html')
@login_required @login_required
def webinar_add(request): def webinar_add(request):
@ -162,14 +170,4 @@ def webinar_change2(request, url):
object_id=getattr(webinar, 'id')) object_id=getattr(webinar, 'id'))
args['obj_id'] = getattr(webinar, 'id') args['obj_id'] = getattr(webinar, 'id')
return render_to_response('webinar_add.html', args) return render_to_response('webinar_add.html', args)
@login_required
def webinar_all(request):
"""
Return list of all webinars
"""
webinars = Webinar.objects.all()
return render_to_response('webinar_all.html', {'webinars':webinars})
Loading…
Cancel
Save