Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.idea/
14 changes: 14 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/untitled.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file added kwiki/__init__.py
Empty file.
Empty file added kwiki/admin_panel/__init__.py
Empty file.
34 changes: 34 additions & 0 deletions kwiki/admin_panel/admin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
from django.contrib import admin
from .models import Article, Catalog, User
from django.forms.widgets import HiddenInput
# Register your models here.


class ArticleLook(admin.ModelAdmin):
list_display = ('title', 'catalog', 'pub_date', 'is_index')
list_filter = ['catalog', 'pub_date', 'is_index']


class CatalogLook(admin.ModelAdmin):
list_display = ('title', 'parent_catalog')
list_filter = ['parent_catalog']


class UserLook(admin.ModelAdmin):
list_display = ('username', 'is_staff')
list_filter = ['is_staff', 'is_superuser', 'groups']
fieldsets = (
(None, {'fields': ('username', 'is_staff', 'is_superuser', 'is_active')}),
('Groups & permissions', {
'classes': ('collapse',),
'fields': ('groups', 'user_permissions')}),
('Advanced options', {
'classes': ('collapse',),
'fields': ('karma',)}),
)


admin.site.register(User, UserLook)
admin.site.register(Article, ArticleLook)
admin.site.register(Catalog, CatalogLook)
# admin.site.register(CustomUser, UserLook)
5 changes: 5 additions & 0 deletions kwiki/admin_panel/apps.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
from django.apps import AppConfig


class AdminpanelConfig(AppConfig):
name = 'admin_panel'
76 changes: 76 additions & 0 deletions kwiki/admin_panel/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.3 on 2017-08-16 02:28
from __future__ import unicode_literals

import django.contrib.auth.models
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')),
('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
('is_superuser', models.BooleanField(default=False, verbose_name='Суперпользователь?')),
('karma', models.IntegerField(default=0, verbose_name='Карма')),
('is_staff', models.BooleanField(default=False, verbose_name='Персонал?')),
('is_active', models.BooleanField(default=False, verbose_name='Активный?')),
('email', models.EmailField(blank=True, max_length=254, null=True, unique=True, verbose_name='E-mail')),
('first_name', models.CharField(blank=True, max_length=30, null=True, verbose_name='Имя')),
('last_name', models.CharField(blank=True, max_length=30, null=True, verbose_name='Фамилия')),
('username', models.CharField(max_length=30, unique=True, verbose_name='Логин')),
('password', models.CharField(max_length=100, verbose_name='Пароль')),
('groups', models.ManyToManyField(blank=True, related_name='Группы', to='auth.Group')),
('user_permissions', models.ManyToManyField(blank=True, related_name='Права', to='auth.Permission')),
],
options={
'verbose_name': 'user',
'verbose_name_plural': 'users',
},
managers=[
('objects', django.contrib.auth.models.UserManager()),
],
),
migrations.CreateModel(
name='Article',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=200, verbose_name='Название')),
('article_text', models.TextField(verbose_name='Текст статьи')),
('pub_date', models.DateTimeField(default=django.utils.timezone.now, verbose_name='Дата публикации')),
('is_index', models.BooleanField(verbose_name='Индесная ?')),
],
options={
'verbose_name': 'Статья',
'verbose_name_plural': 'Статьи',
},
),
migrations.CreateModel(
name='Catalog',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('title', models.CharField(max_length=200, verbose_name='Название')),
('parent_catalog', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='admin_panel.Catalog', verbose_name='Родительский каталог')),
],
options={
'verbose_name': 'Каталог',
'verbose_name_plural': 'Каталоги',
},
),
migrations.AddField(
model_name='article',
name='catalog',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='admin_panel.Catalog', verbose_name='Каталог'),
),
]
27 changes: 27 additions & 0 deletions kwiki/admin_panel/migrations/0002_auto_20170819_2219.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.3 on 2017-08-19 19:19
from __future__ import unicode_literals

import admin_panel.user_manager
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('admin_panel', '0001_initial'),
]

operations = [
migrations.AlterModelManagers(
name='user',
managers=[
('objects', admin_panel.user_manager.UserManager()),
],
),
migrations.AlterField(
model_name='user',
name='is_active',
field=models.BooleanField(default=True, verbose_name='Активный?'),
),
]
32 changes: 32 additions & 0 deletions kwiki/admin_panel/migrations/0003_auto_20170819_2228.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.3 on 2017-08-19 19:28
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('admin_panel', '0002_auto_20170819_2219'),
]

operations = [
migrations.RemoveField(
model_name='user',
name='email',
),
migrations.RemoveField(
model_name='user',
name='first_name',
),
migrations.RemoveField(
model_name='user',
name='last_name',
),
migrations.AlterField(
model_name='user',
name='password',
field=models.CharField(max_length=128, verbose_name='password'),
),
]
Empty file.
65 changes: 65 additions & 0 deletions kwiki/admin_panel/models.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
from django.db import models
from django.core.exceptions import ValidationError
from django.utils.translation import ugettext_lazy as _
from django.contrib.auth.models import Group, Permission, AbstractBaseUser, PermissionsMixin
from django.utils import timezone
from .user_manager import UserManager

# Create your models here.


class Article(models.Model):
class Meta:
verbose_name = 'Статья'
verbose_name_plural = 'Статьи'

catalog = models.ForeignKey('Catalog', verbose_name='Каталог')
title = models.CharField('Название', max_length=200)
article_text = models.TextField('Текст статьи')
pub_date = models.DateTimeField('Дата публикации', default=timezone.now)
is_index = models.BooleanField('Индесная ?')

def clean(self):
if self.is_index and Article.objects.filter(catalog=self.catalog, is_index=True).exclude(id=self.id).exists():
raise ValidationError('Этот каталок уже имеет индексную страницу')

def __str__(self):
return self.title


class Catalog(models.Model):
class Meta:
verbose_name = 'Каталог'
verbose_name_plural = 'Каталоги'

parent_catalog = models.ForeignKey('Catalog', verbose_name='Родительский каталог', blank=True, null=True)
title = models.CharField('Название', max_length=200)

def __str__(self):
return '{0} --> {1}'.format(self.parent_catalog, self.title)

class User(AbstractBaseUser, PermissionsMixin):
groups = models.ManyToManyField(Group, 'Группы', blank=True)
user_permissions = models.ManyToManyField(Permission, 'Права', blank=True)
is_superuser = models.BooleanField('Суперпользователь?', default=False)
karma = models.IntegerField('Карма', default=0)
is_staff = models.BooleanField('Персонал?', default=False)
is_active = models.BooleanField('Активный?', default=True)
username = models.CharField('Логин', max_length=30, unique=True)

objects = UserManager()

USERNAME_FIELD = 'username'

# fields, which must be prompted when creating user via the `createsuperuser`
REQUIRED_FIELDS = []

class Meta:
verbose_name = _('user')
verbose_name_plural = _('users')

def get_short_name(self):
return self.username

def get_full_name(self):
return self.username
Loading