From f55517d7c6a9ac4b96e87078fe55088b652213cf Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Fri, 7 Aug 2015 21:52:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20ci=20migrate=20=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 account/migrations/0001_initial.py            | 39 -----------
 account/migrations/0002_auto_20150731_2310.py | 26 --------
 account/migrations/0003_user_email.py         | 19 ------
 account/migrations/0004_auto_20150806_1645.py | 23 -------
 account/migrations/__init__.py                |  0
 template/admin/index/announcement.html        | 65 -------------------
 6 files changed, 172 deletions(-)
 delete mode 100644 account/migrations/0001_initial.py
 delete mode 100644 account/migrations/0002_auto_20150731_2310.py
 delete mode 100644 account/migrations/0003_user_email.py
 delete mode 100644 account/migrations/0004_auto_20150806_1645.py
 delete mode 100644 account/migrations/__init__.py
 delete mode 100644 template/admin/index/announcement.html

diff --git a/account/migrations/0001_initial.py b/account/migrations/0001_initial.py
deleted file mode 100644
index 03d5584..0000000
--- a/account/migrations/0001_initial.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-import account.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='User',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('password', models.CharField(max_length=128, verbose_name='password')),
-                ('last_login', models.DateTimeField(null=True, verbose_name='last login', blank=True)),
-                ('username', models.CharField(unique=True, max_length=30)),
-                ('real_name', models.CharField(max_length=30, null=True, blank=True)),
-                ('email', models.EmailField(max_length=254, null=True, blank=True)),
-                ('create_time', models.DateTimeField(auto_now_add=True)),
-                ('admin_type', models.IntegerField(default=0)),
-            ],
-            options={
-                'db_table': 'user',
-            },
-            managers=[
-                ('objects', account.models.UserManager()),
-            ],
-        ),
-        migrations.CreateModel(
-            name='AdminGroup',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-            ],
-        ),
-    ]
diff --git a/account/migrations/0002_auto_20150731_2310.py b/account/migrations/0002_auto_20150731_2310.py
deleted file mode 100644
index 73f1b6a..0000000
--- a/account/migrations/0002_auto_20150731_2310.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-import account.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('account', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterModelManagers(
-            name='user',
-            managers=[
-                (b'objects', account.models.UserManager()),
-            ],
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='real_name',
-            field=models.CharField(max_length=30, null=True, blank=True),
-        ),
-    ]
diff --git a/account/migrations/0003_user_email.py b/account/migrations/0003_user_email.py
deleted file mode 100644
index 780afc3..0000000
--- a/account/migrations/0003_user_email.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('account', '0002_auto_20150731_2310'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='email',
-            field=models.EmailField(max_length=254, null=True, blank=True),
-        ),
-    ]
diff --git a/account/migrations/0004_auto_20150806_1645.py b/account/migrations/0004_auto_20150806_1645.py
deleted file mode 100644
index d3d2225..0000000
--- a/account/migrations/0004_auto_20150806_1645.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('account', '0003_user_email'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='user',
-            name='admin_group',
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='admin_type',
-            field=models.IntegerField(default=0),
-        ),
-    ]
diff --git a/account/migrations/__init__.py b/account/migrations/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/template/admin/index/announcement.html b/template/admin/index/announcement.html
deleted file mode 100644
index c93b760..0000000
--- a/template/admin/index/announcement.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<style> [ms-controller] {
-    display: none
-}</style>
-<h1>Announcement</h1>
-<div ms-controller="announcement">
-    <table class="table table-striped">
-        <tr>
-            <th>编号</th>
-            <th>标题</th>
-            <th>创建时间</th>
-            <th>更新时间</th>
-            <th>创建者</th>
-            <th>状态</th>
-            <th>操作</th>
-        </tr>
-        <tr ms-repeat="announcement">
-            <td>{{el.id}}</td>
-            <td>{{el.title}}</td>
-            <td>{{el.create_time|date("yyyy-MM-dd HH:mm:ss")}}</td>
-            <td>{{el.last_update_time|date("yyyy-MM-dd HH:mm:ss")}}</td>
-            <td>{{el.created_by.username}}</td>
-            <td>{{getState(el)}}</td>
-            <td>
-                <button class="btn-sm btn-info" ms-click="enEdit(el)">编辑</button>
-            </td>
-        </tr>
-    </table>
-    <div class="text-right">
-        页数：{{page}}/{{page+next_page}}
-        <botton ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</botton>
-        <botton ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</botton>
-    </div>
-
-    <div ms-visible="isEditing">
-        <h3>编辑公告</h3>
-
-        <div class="form-group"><label for="title">标题</label>
-            <input name="title" type="text" class="form-control" id="newTitle" placeholder="公告标题" value=""></div>
-        <div class="form-group">
-            <label>内容</label>
-            <textarea id="editAnnouncementEditor"></textarea>
-        </div>
-        <div class="form-group">
-            <label>隐藏</label>
-            <input type="checkbox" id="hidden">
-        </div>
-        <div class="form-group">
-            <button ms-click="submitChange()" class="btn btn-primary">提交</button><button ms-click="disEdit()" class="btn btn-danger">取消</button>
-        </div>
-    </div>
-    <h3>添加公告</h3>
-
-    <form id="announcement-form">
-        <div class="form-group"><label for="title">标题</label>
-            <input name="title" type="text" class="form-control" id="title" placeholder="公告标题"></div>
-        <div class="form-group">
-            <label>内容</label>
-            <textarea id="editor" placeholder="公告内容"></textarea>
-        </div>
-        <div class="form-group">
-            <button type="submit" class="btn btn-primary">提交</button>
-        </div>
-    </form>
-</div>
-<script src="/static/js/app/admin/announcement/announcement.js"></script>
\ No newline at end of file