update .gitignore

.gitignore

@@ -14,6 +14,6 @@ _mailinglist
 .idea/
 db.sqlite3
 config.py
-migrations/*
+migrations/
 !migrations/__init__.py
 *.log

apps/perms/migrations/0001_initial.py

-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-09-24 02:14
-from __future__ import unicode_literals
-
-import common.utils
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('assets', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='AssetPermission',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=128, unique=True, verbose_name='Name')),
-                ('private_for', models.CharField(blank=True, choices=[('N', 'None'), ('U', 'user'), ('G', 'user group')], default='N', max_length=1, verbose_name='Private for')),
-                ('is_active', models.BooleanField(default=True, verbose_name='Active')),
-                ('date_expired', models.DateTimeField(default=common.utils.date_expired_default, verbose_name='Date expired')),
-                ('created_by', models.CharField(blank=True, max_length=128, verbose_name='Created by')),
-                ('date_created', models.DateTimeField(auto_now=True, verbose_name='Date created')),
-                ('comment', models.TextField(blank=True, verbose_name='Comment')),
-                ('asset_groups', models.ManyToManyField(blank=True, related_name='granted_by_permissions', to='assets.AssetGroup')),
-                ('assets', models.ManyToManyField(blank=True, related_name='granted_by_permissions', to='assets.Asset')),
-                ('system_users', models.ManyToManyField(related_name='granted_by_permissions', to='assets.SystemUser')),
-            ],
-            options={
-                'db_table': 'asset_permission',
-            },
-        ),
-    ]

apps/perms/migrations/0002_auto_20160924_1014.py

-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-09-24 02:14
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('users', '0001_initial'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('perms', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='assetpermission',
-            name='user_groups',
-            field=models.ManyToManyField(blank=True, related_name='asset_permissions', to='users.UserGroup'),
-        ),
-        migrations.AddField(
-            model_name='assetpermission',
-            name='users',
-            field=models.ManyToManyField(blank=True, related_name='asset_permissions', to=settings.AUTH_USER_MODEL),
-        ),
-    ]

apps/users/migrations/0001_initial.py

-# -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2016-09-24 02:14
-from __future__ import unicode_literals
-
-import common.utils
-import django.contrib.auth.models
-from django.db import migrations, models
-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')),
-                ('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')),
-                ('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')),
-                ('username', models.CharField(max_length=20, unique=True, verbose_name='Username')),
-                ('name', models.CharField(blank=True, max_length=20, verbose_name='Name')),
-                ('email', models.EmailField(max_length=30, unique=True, verbose_name='Email')),
-                ('role', models.CharField(blank=True, choices=[('Admin', 'Administrator'), ('User', 'User')], default='User', max_length=10, verbose_name='Role')),
-                ('avatar', models.ImageField(upload_to='avatar', verbose_name='Avatar')),
-                ('wechat', models.CharField(blank=True, max_length=30, verbose_name='Wechat')),
-                ('phone', models.CharField(blank=True, max_length=20, verbose_name='Phone')),
-                ('enable_otp', models.BooleanField(default=False, verbose_name='Enable OTP')),
-                ('secret_key_otp', models.CharField(blank=True, max_length=16)),
-                ('_private_key', models.CharField(blank=True, max_length=5000, verbose_name='ssh private key')),
-                ('_public_key', models.CharField(blank=True, max_length=1000, verbose_name='ssh public key')),
-                ('comment', models.TextField(blank=True, max_length=200, verbose_name='Comment')),
-                ('is_first_login', models.BooleanField(default=False)),
-                ('date_expired', models.DateTimeField(blank=True, default=common.utils.date_expired_default, null=True, verbose_name='Date expired')),
-                ('created_by', models.CharField(default='', max_length=30, verbose_name='Created by')),
-            ],
-            options={
-                'db_table': 'user',
-            },
-            managers=[
-                ('objects', django.contrib.auth.models.UserManager()),
-            ],
-        ),
-        migrations.CreateModel(
-            name='UserGroup',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('is_discard', models.BooleanField(default=False, verbose_name='is discard')),
-                ('discard_time', models.DateTimeField(blank=True, null=True, verbose_name='discard time')),
-                ('name', models.CharField(max_length=100, unique=True, verbose_name='Name')),
-                ('comment', models.TextField(blank=True, verbose_name='Comment')),
-                ('date_created', models.DateTimeField(auto_now_add=True)),
-                ('created_by', models.CharField(max_length=100)),
-            ],
-            options={
-                'db_table': 'user_group',
-            },
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='groups',
-            field=models.ManyToManyField(blank=True, related_name='users', to='users.UserGroup', verbose_name='User group'),
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='user_permissions',
-            field=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'),
-        ),
-    ]