Произошла ошибка (form)
' - '{form}'
- ).format(form=pformat(form.errors)))
+ realty = realty_form.save(commit=False)
+ realty.user = request.user
+ realty.save()
+ realty_form.save_m2m()
-
- if realty_form and realty_form.errors:
- messages.info(request, (
- 'Произошла ошибка (realty_form)
' - '{realty_form}'
- ).format(realty_form=pformat(realty_form.errors)))
-
- context.update({'form': form, 'realty_form': realty_form})
- return render(request, self.template_name, context)
+ messages.info(request, 'Проект успешно создан')
+ redirect_to = reverse('projects:detail', kwargs={'pk': project.pk})
+ return redirect(redirect_to)
+ else:
+ if form.errors:
+ messages.info(request, (
+ 'Произошла ошибка (form)
' + '{form}'
+ ).format(form=pformat(form.errors)))
+
+ if realty_form and realty_form.errors:
+ messages.info(request, (
+ 'Произошла ошибка (realty_form)
' + '{realty_form}'
+ ).format(realty_form=pformat(realty_form.errors)))
+
+ context = self.get_context_data(**kwargs)
+ context.update({'form': form, 'realty_form': realty_form})
+ return render(request, self.template_name, context)
else:
return HttpResponseForbidden('403 Forbidden')
@@ -144,19 +101,14 @@ class ProjectView(BaseMixin, View):
customer_template_name = 'customer_project_detail.html'
def get(self, request, *args, **kwargs):
+ project = get_object_or_404(Project, pk=kwargs.get('pk'))
+
+ context = self.get_context_data(**_.merge({}, request.GET, kwargs))
+ context.update({'project': project})
+
if request.user.is_authenticated() and request.user.is_customer():
- project = get_object_or_404(request.user.projects, pk=kwargs.get('pk'))
-
- context = self.get_context_data(**_.merge({}, request.GET, kwargs))
- context.update({'project': project})
-
return render(request, self.customer_template_name, context)
else:
- project = get_object_or_404(Project, pk=kwargs.get('pk'))
-
- context = self.get_context_data(**_.merge({}, request.GET, kwargs))
- context.update({'project': project})
-
return render(request, self.template_name, context)
diff --git a/specializations/filters.py b/specializations/filters.py
index 0febe13..53e667c 100755
--- a/specializations/filters.py
+++ b/specializations/filters.py
@@ -2,8 +2,8 @@ from rest_framework_filters import FilterSet, RelatedFilter, AllLookupsFilter
from .models import Specialization
class SpecializationFilterSet(FilterSet):
- id = AllLookupsFilter()
children = RelatedFilter('specializations.filters.SpecializationFilterSet')
+ id = AllLookupsFilter()
level = AllLookupsFilter()
lft = AllLookupsFilter()
name = AllLookupsFilter()
diff --git a/specializations/serializers.py b/specializations/serializers.py
index 219527f..323041b 100755
--- a/specializations/serializers.py
+++ b/specializations/serializers.py
@@ -3,13 +3,33 @@ from rest_framework.serializers import ModelSerializer
from .models import Specialization
-class SpecializationSerializer(ModelSerializer):
+class NestedSpecializationSerializer(ModelSerializer):
class Meta:
model = Specialization
fields = (
+ 'children',
'id',
+ 'level',
+ 'lft',
+ 'name',
+ 'parent',
+ 'projects',
+ 'rght',
+ 'tree_id',
+ )
+
+
+class SpecializationSerializer(ModelSerializer):
+ children = NestedSpecializationSerializer(many=True)
+ parent = NestedSpecializationSerializer()
+
+ class Meta:
+ model = Specialization
+
+ fields = (
'children',
+ 'id',
'level',
'lft',
'name',
diff --git a/users/filters.py b/users/filters.py
index 82a0753..12af244 100755
--- a/users/filters.py
+++ b/users/filters.py
@@ -2,13 +2,13 @@ from rest_framework_filters import FilterSet, RelatedFilter, AllLookupsFilter
from .models import User
class UserFilterSet(FilterSet):
- id = AllLookupsFilter()
- email = AllLookupsFilter()
- first_name = AllLookupsFilter()
- is_active = AllLookupsFilter()
- is_admin = AllLookupsFilter()
- last_name = AllLookupsFilter()
- projects = RelatedFilter('projects.filters.ProjectFilterSet')
+ # id = AllLookupsFilter()
+ # email = AllLookupsFilter()
+ # first_name = AllLookupsFilter()
+ # is_active = AllLookupsFilter()
+ # is_admin = AllLookupsFilter()
+ # last_name = AllLookupsFilter()
+ # projects = RelatedFilter('projects.filters.ProjectFilterSet')
class Meta:
model = User
diff --git a/users/serializers.py b/users/serializers.py
index 74e3af5..f7aff5d 100755
--- a/users/serializers.py
+++ b/users/serializers.py
@@ -9,19 +9,31 @@ class UserSerializer(ModelSerializer):
model = User
fields = (
- 'id',
+ 'avatar',
+ 'contractor_financial_info',
+ 'contractor_specializations',
+ 'contractor_status',
+ 'created',
+ 'cro',
+ 'date_of_birth',
'email',
'first_name',
+ 'gender',
+ 'id',
'is_active',
- 'is_admin',
'last_name',
- 'projects',
+ 'last_time_visit',
+ 'location',
+ 'nickname',
+ 'patronym',
+ 'skype',
+ 'website',
)
- read_only_fields = (
- 'is_active',
- 'is_admin',
- )
+ # read_only_fields = (
+ # 'is_active',
+ # 'is_admin',
+ # )
# def create(self, validated_data):
# return User.objects.create(**validated_data)