diff --git a/projects/urls.py b/projects/urls.py
index c656547..2b24299 100644
--- a/projects/urls.py
+++ b/projects/urls.py
@@ -3,6 +3,7 @@ from django.conf import urls
from .views import ProjectListView, ProjectDetailView, ProjectCreateView
+
urlpatterns = [
urls.url(r'^$', ProjectListView.as_view(), name='projects-list'),
urls.url(r'^create/$', ProjectCreateView.as_view(), name='project-create'),
diff --git a/projects/views.py b/projects/views.py
index 7bee5bc..c83bc6d 100644
--- a/projects/views.py
+++ b/projects/views.py
@@ -14,17 +14,13 @@ class ProjectListView(ListView):
def get_context_data(self, **kwargs):
context = super(ProjectListView, self).get_context_data(**kwargs)
- # context['permissions'] = Permission.objects.filter(group__user=self.request.user.id)
- user = CustomUser.objects.get(id=self.request.user.id)
- # context['permissions'] = user.user_permissions.all()
- context['permissions'] = Permission.objects.filter(group__user=user)
- context['user_id'] = user
return context
class ProjectDetailView(DetailView):
model = Project
+
class ProjectCreateView(PermissionRequiredMixin, CreateView):
model = Project
permission_required = ['projects.add_project']
diff --git a/specialization/__init__.py b/specialization/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/specialization/admin.py b/specialization/admin.py
new file mode 100644
index 0000000..fc5bce4
--- /dev/null
+++ b/specialization/admin.py
@@ -0,0 +1,5 @@
+from django.contrib import admin
+from mptt.admin import MPTTModelAdmin
+from specialization.models import Specialization
+
+admin.site.register(Specialization, MPTTModelAdmin)
\ No newline at end of file
diff --git a/specialization/apps.py b/specialization/apps.py
new file mode 100644
index 0000000..f3b60a1
--- /dev/null
+++ b/specialization/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class SpecializationConfig(AppConfig):
+ name = 'specialization'
diff --git a/specialization/migrations/0001_initial.py b/specialization/migrations/0001_initial.py
new file mode 100644
index 0000000..ff95c73
--- /dev/null
+++ b/specialization/migrations/0001_initial.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-05-12 09:28
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = [
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Category',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('path', models.CharField(max_length=255, unique=True)),
+ ('depth', models.PositiveIntegerField()),
+ ('numchild', models.PositiveIntegerField(default=0)),
+ ('name', models.CharField(max_length=50)),
+ ],
+ options={
+ 'abstract': False,
+ },
+ ),
+ ]
diff --git a/specialization/migrations/0002_auto_20160512_1013.py b/specialization/migrations/0002_auto_20160512_1013.py
new file mode 100644
index 0000000..044e9af
--- /dev/null
+++ b/specialization/migrations/0002_auto_20160512_1013.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-05-12 10:13
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import django.db.models.manager
+import mptt.fields
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('specialization', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Specialization',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(max_length=100)),
+ ('lft', models.PositiveIntegerField(db_index=True, editable=False)),
+ ('rght', models.PositiveIntegerField(db_index=True, editable=False)),
+ ('tree_id', models.PositiveIntegerField(db_index=True, editable=False)),
+ ('level', models.PositiveIntegerField(db_index=True, editable=False)),
+ ('parent', mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='specialization.Specialization')),
+ ],
+ options={
+ 'abstract': False,
+ },
+ managers=[
+ ('_default_manager', django.db.models.manager.Manager()),
+ ],
+ ),
+ migrations.DeleteModel(
+ name='Category',
+ ),
+ ]
diff --git a/specialization/migrations/__init__.py b/specialization/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/specialization/models.py b/specialization/models.py
new file mode 100644
index 0000000..711bc2f
--- /dev/null
+++ b/specialization/models.py
@@ -0,0 +1,19 @@
+from django.db import models
+from mptt.models import MPTTModel, TreeForeignKey
+from mptt.managers import TreeManager
+
+class Specialization(MPTTModel):
+ name = models.CharField(max_length=100)
+ parent = TreeForeignKey('self', null=True, blank=True, related_name='children', db_index=True)
+
+ objects = TreeManager()
+
+ def __str__(self):
+ return self.name
+
+ class MPTTMeta:
+ order_insertion_by = ['name']
+
+
+
+
diff --git a/specialization/templates/specialization/specialization_list.html b/specialization/templates/specialization/specialization_list.html
new file mode 100644
index 0000000..2f64781
--- /dev/null
+++ b/specialization/templates/specialization/specialization_list.html
@@ -0,0 +1,30 @@
+{% extends "base.html" %}
+{% block content %}
+
Специализации
+ {% load mptt_tags %}
+{# {% for spec in object_list %}#}
+{#
{{ spec }}
#}
+{# {% endfor %}#}
+{##}
+{# {% load mptt_tags %}#}
+{#
#}
+{# {% recursetree object_list %}#}
+{# - #}
+{# {{ node.name }}#}
+{# {% if not node.is_leaf_node %}#}
+{#
#}
+{# {{ children }}#}
+{#
#}
+{# {% endif %}#}
+{# #}
+{# {% endrecursetree %}#}
+{#
#}
+ {{ root }}
+ {% for ch in children %}
+
{{ ch }}
+ {% for ch1 in ch.get_children %}
+ {{ ch1 }}
+ {% endfor %}
+ {% endfor %}
+{% endblock %}
+
diff --git a/specialization/tests.py b/specialization/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/specialization/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/specialization/urls.py b/specialization/urls.py
new file mode 100644
index 0000000..03cbe75
--- /dev/null
+++ b/specialization/urls.py
@@ -0,0 +1,8 @@
+from django.conf import urls
+# from django.contrib.auth.views import login, logout
+
+from .views import SpecListView
+
+urlpatterns = [
+ urls.url(r'^$', SpecListView.as_view(), name='spec-list'),
+]
\ No newline at end of file
diff --git a/specialization/views.py b/specialization/views.py
new file mode 100644
index 0000000..a107e37
--- /dev/null
+++ b/specialization/views.py
@@ -0,0 +1,16 @@
+from django.shortcuts import render
+from django.views.generic import ListView
+from .models import Specialization
+
+class SpecListView(ListView):
+ model = Specialization
+
+ def get_context_data(self, **kwargs):
+ context = super(SpecListView, self).get_context_data(**kwargs)
+ root = Specialization.objects.get(pk=1)
+ context['root'] = root
+ context['children'] = root.get_children()
+ context['roots'] = Specialization.objects.root_nodes()
+ return context
+
+
diff --git a/templates/registration/login.html b/templates/registration/login.html
new file mode 100644
index 0000000..38140db
--- /dev/null
+++ b/templates/registration/login.html
@@ -0,0 +1,24 @@
+{% extends 'base.html' %}
+{% block content %}
+
Вход на сайт
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html
new file mode 100644
index 0000000..85a2a9c
--- /dev/null
+++ b/templates/registration/registration_form.html
@@ -0,0 +1,13 @@
+{% extends 'base.html' %}
+{% block content %}
+
Регистрация
+
+{% endblock %}
\ No newline at end of file
diff --git a/test.py b/test.py
deleted file mode 100644
index 8f7e6dd..0000000
--- a/test.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import requests
-
-urls = [
- "https://habrahabr.ru/all/",
- "https://pythondigest.ru/feed/"
-]
-
-for url in urls:
- req_info = requests.get(url)
- print(req_info.encoding)
- print(req_info.text)
\ No newline at end of file
diff --git a/users/admin.py b/users/admin.py
index 5cd50eb..480c3a8 100644
--- a/users/admin.py
+++ b/users/admin.py
@@ -1,4 +1,5 @@
from django.contrib import admin
+from guardian.admin import GuardedModelAdmin
from .models import CustomUser
-admin.site.register(CustomUser)
+admin.site.register(CustomUser, GuardedModelAdmin)
diff --git a/users/migrations/0002_auto_20160511_1135.py b/users/migrations/0002_auto_20160511_1135.py
new file mode 100644
index 0000000..20035ca
--- /dev/null
+++ b/users/migrations/0002_auto_20160511_1135.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-05-11 11:35
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('users', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='customuser',
+ name='firstname',
+ field=models.CharField(blank=True, max_length=255),
+ ),
+ migrations.AddField(
+ model_name='customuser',
+ name='lastname',
+ field=models.CharField(blank=True, max_length=255),
+ ),
+ ]
diff --git a/users/models.py b/users/models.py
index 83033b9..9bc58af 100644
--- a/users/models.py
+++ b/users/models.py
@@ -2,6 +2,7 @@ from django.db import models
from django.contrib.auth.models import AbstractBaseUser, BaseUserManager
from django.contrib.auth.models import PermissionsMixin
+
class CustomUserManager(BaseUserManager):
def create_user(self, email, password=None):
@@ -19,7 +20,22 @@ class CustomUserManager(BaseUserManager):
user.save(using=self._db)
return user
+
+class PerformUserManager(models.Manager):
+
+ def get_queryset(self):
+ return super(PerformUserManager, self).get_queryset().filter(groups__name='Исполнитель')
+
+
+class CustomerUserManager(models.Manager):
+
+ def get_queryset(self):
+ return super(CustomerUserManager, self).get_queryset().filter(groups__name='Заказчик')
+
+
class CustomUser(AbstractBaseUser, PermissionsMixin):
+ firstname = models.CharField(max_length=255, blank=True)
+ lastname = models.CharField(max_length=255, blank=True)
email = models.EmailField(max_length=255, unique=True, db_index=True)
is_active = models.BooleanField(default=True)
is_admin = models.BooleanField(default=False)
@@ -34,7 +50,8 @@ class CustomUser(AbstractBaseUser, PermissionsMixin):
def get_short_name(self):
return self.email
-
+ def get_full_name(self):
+ return self.firstname + ' ' + self.lastname
# def has_perm(self, perm, obj=None):
# perm = perm.split('.')[-1]
@@ -46,8 +63,7 @@ class CustomUser(AbstractBaseUser, PermissionsMixin):
#
def has_perm(self, perm, obj=None):
- return False
-
+ return True
def has_module_perms(self, app_label):
return self.is_admin
@@ -55,6 +71,8 @@ class CustomUser(AbstractBaseUser, PermissionsMixin):
USERNAME_FIELD = 'email'
REQUIRED_FIELDS = []
objects = CustomUserManager()
+ perform_objects = PerformUserManager()
+ customers_objects = CustomerUserManager()
diff --git a/users/templates/users/users_info_list.html b/users/templates/users/users_info_list.html
new file mode 100644
index 0000000..3648c78
--- /dev/null
+++ b/users/templates/users/users_info_list.html
@@ -0,0 +1,15 @@
+{% extends "base.html" %}
+
+
+{% block content %}
+
Исполнители
+ {% for perf in performers %}
+
{{ perf }}
+ {% endfor %}
+
+
Заказчики
+ {% for cust in customers %}
+
{{ cust }}
+ {% endfor %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/users/templates/users/users_list.html b/users/templates/users/users_list.html
index 52843e2..fc507a8 100644
--- a/users/templates/users/users_list.html
+++ b/users/templates/users/users_list.html
@@ -1,7 +1,61 @@
{% extends "base.html" %}
+
+
{% block content %}
-
Пользователи
- {% for user in users %}
-
{{ user }}
- {% endfor %}
+
+
+
Дизайн интерьера квартиры 200m2
+
+
+ | № |
+ Кандидат |
+ Цена |
+ Срок |
+ Описание |
+ Рейтинги/отзывы |
+ Безопасные сделки |
+ Решение |
+
+ {% for user in users %}
+
+ | 1 |
+
+ {{ user.get_full_name }}
+ |
+ 35 000 |
+
+ 3
недели
+ |
+
+
+ |
+
+
+ - 23 560
+ -
+ +385
+ 0
+ - 0
+
+ -
+ СРО
+
+
+ |
+
+ 5
+ Готов работать по безопасной сделке
+ |
+
+
+ |
+
+ {% endfor %}
+
+
{% endblock %}
\ No newline at end of file
diff --git a/users/templatetags/user_tags.py b/users/templatetags/user_tags.py
new file mode 100644
index 0000000..95a95ad
--- /dev/null
+++ b/users/templatetags/user_tags.py
@@ -0,0 +1,8 @@
+from django import template
+
+register = template.Library()
+
+@register.filter('has_group')
+def has_group(user, group_name):
+ groups = user.groups.all().values_list('name', flat=True)
+ return True if group_name in groups else False
\ No newline at end of file
diff --git a/users/urls.py b/users/urls.py
index fee2b0c..c8cebe9 100644
--- a/users/urls.py
+++ b/users/urls.py
@@ -1,11 +1,12 @@
from django.conf import urls
from django.contrib.auth.views import login, logout
-from .views import UserListView , UserDetailView
+from .views import UserListView, UserDetailView, UserInfoListView
urlpatterns = [
urls.url(r'^profile/$', UserDetailView.as_view(), name='user-detail'),
# urls.url(r'^login/?$', login, {'template_name': 'users/login.html'}),
# urls.url(r'^logout/?$', logout),
urls.url(r'^$', UserListView.as_view(), name='users_list'),
+ urls.url(r'^info$', UserInfoListView.as_view(), name='users_info_list'),
]
\ No newline at end of file
diff --git a/users/views.py b/users/views.py
index 9208fa0..c2a1faa 100644
--- a/users/views.py
+++ b/users/views.py
@@ -1,4 +1,5 @@
from django.shortcuts import render
+from django.contrib.auth.models import Group
from django.views.generic import ListView, DetailView
from .models import CustomUser
@@ -8,5 +9,17 @@ class UserListView(ListView):
template_name = 'users/users_list.html'
context_object_name = 'users'
+
+class UserInfoListView(ListView):
+ model = CustomUser
+ template_name = 'users/users_info_list.html'
+
+ def get_context_data(self, **kwargs):
+ context = super(UserInfoListView, self).get_context_data(**kwargs)
+ context['groups'] = Group.objects.all()
+ context['performers'] = CustomUser.perform_objects.all()
+ context['customers'] = CustomUser.customers_objects.all()
+ return context
+
class UserDetailView(DetailView):
model = CustomUser
\ No newline at end of file