-
Название заказа {{ form.name.errors.as_text }}
+
Название заказа {{ form.name.errors.as_text }}
-
Подробно опишите задание {{ form.text.errors.as_text }}
-
+
Подробно опишите задание {{ form.text.errors.as_text }}
+
diff --git a/users/pipeline.py b/users/pipeline.py
index ddd79c6..16e2b64 100644
--- a/users/pipeline.py
+++ b/users/pipeline.py
@@ -1,4 +1,4 @@
-from django.shortcuts import redirect, render_to_response
+from django.shortcuts import redirect, render_to_response, render
from django.core.mail import EmailMultiAlternatives
from django.template.loader import get_template, render_to_string
from social.pipeline.partial import partial
@@ -38,8 +38,8 @@ def add_email_for_user(backend, details, response, is_new=False, *args, **kwargs
data = backend.strategy.request_data()
if is_new:
if not details.get('email'):
- if 'email' in kwargs['request']:
- return {'email': kwargs['request']['email']}
+ if 'email' in data:
+ return {'email': data.get('email')}
else:
return render_to_response('add_email_form.html')
diff --git a/users/signals.py b/users/signals.py
index b32c869..e78c6ef 100644
--- a/users/signals.py
+++ b/users/signals.py
@@ -6,7 +6,7 @@ from users.models import ContractorResume
@receiver(user_registered)
def user_registered_callback(sender, user, request, **kwargs):
# import code; code.interact(local=dict(globals(), **locals()))
- group_name = request.POST['group_id'] or None
+ group_name = request.POST['group_id'] or 'Исполнители'
g = Group.objects.get(name=group_name)
g.user_set.add(user)
if group_name == 'Исполнители':
diff --git a/users/templates/add_email_form.html b/users/templates/add_email_form.html
index e32ce1f..58e4c02 100644
--- a/users/templates/add_email_form.html
+++ b/users/templates/add_email_form.html
@@ -1,7 +1,7 @@
{% extends 'partials/base.html' %}
{% block content %}
- {% include 'partials/header.html' %}
+
diff --git a/wallets/migrations/0012_auto_20160901_1247.py b/wallets/migrations/0012_auto_20160901_1247.py
new file mode 100644
index 0000000..dc3b386
--- /dev/null
+++ b/wallets/migrations/0012_auto_20160901_1247.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-09-01 09:47
+from __future__ import unicode_literals
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('wallets', '0011_withdraw_complete'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='withdraw',
+ name='sum',
+ field=models.DecimalField(decimal_places=0, max_digits=10, validators=[django.core.validators.MinValueValidator(1)]),
+ ),
+ ]
diff --git a/work_sell/migrations/0009_auto_20160901_1247.py b/work_sell/migrations/0009_auto_20160901_1247.py
new file mode 100644
index 0000000..2c85f21
--- /dev/null
+++ b/work_sell/migrations/0009_auto_20160901_1247.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-09-01 09:47
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('work_sell', '0008_merge'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='worksell',
+ name='term_type',
+ field=models.CharField(blank=True, choices=[('day', 'За день'), ('hour', 'За час'), ('month', 'За месяц'), ('project', 'За проект')], default='hour', max_length=20, null=True),
+ ),
+ ]