Skip to content

Commit

Permalink
Добавление кастомного юзера.
Browse files Browse the repository at this point in the history
  • Loading branch information
Sawa Demidenko committed Oct 30, 2017
1 parent f976862 commit 080c127
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 6 deletions.
2 changes: 2 additions & 0 deletions ask_sdemidenko/settings.py
Expand Up @@ -121,3 +121,5 @@
# https://docs.djangoproject.com/en/1.10/howto/static-files/

STATIC_URL = '/static/'

AUTH_USER_MODEL = 'questions.User'
3 changes: 2 additions & 1 deletion questions/admin.py
@@ -1,5 +1,6 @@
from django.contrib import admin

from questions.models import Question
from questions.models import Question, User

admin.site.register(Question)
admin.site.register(User)
44 changes: 39 additions & 5 deletions questions/migrations/0001_initial.py
@@ -1,27 +1,61 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.6 on 2017-03-27 18:13
# Generated by Django 1.11.5 on 2017-10-30 15:45
from __future__ import unicode_literals

import datetime
from django.conf import settings
import django.contrib.auth.models
import django.contrib.auth.validators
from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone


class Migration(migrations.Migration):

initial = True

dependencies = [
('auth', '0008_alter_user_username_max_length'),
]

operations = [
migrations.CreateModel(
name='User',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('password', models.CharField(max_length=128, verbose_name='password')),
('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')),
('last_name', models.CharField(blank=True, max_length=30, verbose_name='last name')),
('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
('upload', models.ImageField(upload_to='uploads/%Y/%m/%d/')),
('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')),
('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')),
],
options={
'verbose_name': 'user',
'verbose_name_plural': 'users',
'abstract': False,
},
managers=[
('objects', django.contrib.auth.models.UserManager()),
],
),
migrations.CreateModel(
name='Question',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=120, verbose_name='\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a \u0432\u043e\u043f\u0440\u043e\u0441\u0430')),
('text', models.TextField(verbose_name='\u041f\u043e\u043b\u043d\u043e\u0435 \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u0432\u043e\u043f\u0440\u043e\u0441\u0430')),
('create_date', models.DateTimeField(default=datetime.datetime.now, verbose_name='\u0412\u0440\u0435\u043c\u044f \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u044f \u0432\u043e\u043f\u0440\u043e\u0441\u0430')),
('is_active', models.BooleanField(default=True, verbose_name='\u0414\u043e\u0441\u0442\u0443\u043f\u043d\u043e\u0441\u0442\u044c \u0432\u043e\u043f\u0440\u043e\u0441\u0430')),
('title', models.CharField(max_length=120, verbose_name='Заголовок вопроса')),
('text', models.TextField(verbose_name='Полное описание вопроса')),
('create_date', models.DateTimeField(default=datetime.datetime.now, verbose_name='Время создания вопроса')),
('is_active', models.BooleanField(default=True, verbose_name='Доступность вопроса')),
('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
options={
'ordering': ['-create_date'],
Expand Down
8 changes: 8 additions & 0 deletions questions/models.py
Expand Up @@ -2,10 +2,18 @@
from __future__ import unicode_literals

from datetime import datetime

from django.contrib.auth.models import AbstractUser
from django.db import models


class User(AbstractUser):
upload = models.ImageField(upload_to='uploads/%Y/%m/%d/')


class Question(models.Model):
author = models.ForeignKey(User)

title = models.CharField(max_length=120, verbose_name=u"Заголовок вопроса")
text = models.TextField(verbose_name=u"Полное описание вопроса")

Expand Down

0 comments on commit 080c127

Please sign in to comment.