@@ -355,7 +364,7 @@
Портфолио {{ form.portfolios.errors.as_text }}
diff --git a/projects/views.py b/projects/views.py
index b4b6758..dba295b 100644
--- a/projects/views.py
+++ b/projects/views.py
@@ -22,7 +22,7 @@ from work_sell.models import Picture
from .forms import (
ContractorPortfolioTrashForm,
- ContractorProjectAnswerForm,
+ ProjectAnswerForm,
CustomerProjectDeleteForm,
CustomerProjectEditForm,
CustomerProjectEditForm,
@@ -36,7 +36,7 @@ from .forms import (
class ProjectDetailWithContractorAnswerView(BaseMixin, View):
- form_class = ContractorProjectAnswerForm
+ form_class = ProjectAnswerForm
template_name = 'project_detail.html'
def get(self, request, *args, **kwargs):
@@ -69,7 +69,14 @@ class ProjectDetailWithContractorAnswerView(BaseMixin, View):
if got_answer:
context.update({'answer': answer})
else:
- form = self.form_class(request=request)
+ if request.GET.get('answer_as_team') == 'on': # TODO: Check for actual possibility to answer as a team
+ context.update({'answer_as_team': True})
+ form = self.form_class(request=request, answer_as_team=True)
+ else:
+ form = self.form_class(request=request)
+
+ # import code; code.interact(local=dict(globals(), **locals()))
+
context.update({'form': form})
return render(request, self.template_name, context)
@@ -77,32 +84,44 @@ class ProjectDetailWithContractorAnswerView(BaseMixin, View):
def post(self, request, *args, **kwargs):
if request.user.is_authenticated() and request.user.is_contractor():
context = self.get_context_data(**kwargs)
- form = self.form_class(request.POST, request=request)
+
+ if request.POST.get('answer_as_team') == 'on':
+ form = self.form_class(request.POST, request=request, answer_as_team=True)
+ else:
+ form = self.form_class(request.POST, request=request)
project = get_object_or_404(Project, pk=kwargs.get('pk'))
context.update({'project': project})
if form.is_valid():
- answer = form.save(commit=False)
- answer.project = project
- answer.author = request.user
- answer.save()
- form.save_m2m()
+ print('Form valid. "form.cleaned_data": ###############')
+ pprint(form.cleaned_data)
+ print('################################################')
- for file in request.FILES.getlist('new_files'):
- if len(file.name) <= 255:
- AnswerFile.objects.create(file=file, name=file.name, answer=answer)
+ # answer = form.save(commit=False)
+ # answer.project = project
+ # answer.author = request.user
+ # answer.save()
+ # form.save_m2m()
+ #
+ # for file in request.FILES.getlist('new_files'):
+ # if len(file.name) <= 255:
+ # AnswerFile.objects.create(file=file, name=file.name, answer=answer)
messages.info(request, 'Отклик успешно размещён')
redirect_to = request.POST.get('next')
return redirect(redirect_to)
else:
+ print('Form invalid. "form.data": #####################')
+ pprint(form.data)
+ print('################################################')
+
if form.errors:
messages.info(request, (
'
Произошла ошибка (form)
'
'
{form}'
).format(form=pformat(form.errors)))
-
+
context.update({'form': form})
return render(request, self.template_name, context)
else:
diff --git a/users/migrations/0008_auto_20160812_1018.py b/users/migrations/0008_auto_20160812_1018.py
new file mode 100644
index 0000000..8f2467b
--- /dev/null
+++ b/users/migrations/0008_auto_20160812_1018.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-12 07:18
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('users', '0007_auto_20160808_1557'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='contractorresumefiles',
+ name='title',
+ field=models.CharField(blank=True, max_length=255),
+ ),
+ migrations.AlterField(
+ model_name='contractorresumefiles',
+ name='type',
+ field=models.CharField(choices=[('diplom', 'Дипломы/Сертификаты'), ('cro', 'Допуск CPO')], default='diplom', max_length=50),
+ ),
+ ]
diff --git a/work_sell/migrations/0003_auto_20160812_1018.py b/work_sell/migrations/0003_auto_20160812_1018.py
new file mode 100644
index 0000000..1eec17b
--- /dev/null
+++ b/work_sell/migrations/0003_auto_20160812_1018.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-12 07:18
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('work_sell', '0002_auto_20160805_1736'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='worksell',
+ name='created',
+ field=models.DateTimeField(default=django.utils.timezone.now),
+ ),
+ ]