Merge remote-tracking branch 'origin/collection' into collection

# Conflicts:
#	data-dev.sqlite

flasky.py

@@ -95,17 +95,17 @@ def favicon():
 # app.secret_key = GeetestLib.VERSION
 
 # User, Role, Students, Permission, Post, Comment, Like, Notification, Transaction, Activity
-# admin.add_view(ModelView(User, db.session, name="Users", endpoint="users"))
-# admin.add_view(ModelView(Role, db.session, name="roles", endpoint="roles"))
-# admin.add_view(ModelView(Students, db.session, name="Studentss", endpoint="Studentss"))
-# # admin.add_view(ModelView(Permission, db.session, name="Permissions", endpoint="Permissions"))
-# admin.add_view(ModelView(Post, db.session, name="Posts", endpoint="Posts"))
-# admin.add_view(ModelView(Comment, db.session, name="Comments", endpoint="Comments"))
-# admin.add_view(ModelView(Like, db.session, name="Likes", endpoint="Likes"))
-# admin.add_view(ModelView(Notification, db.session, name="Notifications", endpoint="Notifications"))
-# admin.add_view(ModelView(Transaction, db.session, name="Transactions", endpoint="Transactions"))
-# admin.add_view(ModelView(Activity, db.session, name="Activities", endpoint="Activities"))
-# admin.add_view(FileAdmin("."))
+admin.add_view(ModelView(User, db.session, name="Users", endpoint="users"))
+admin.add_view(ModelView(Role, db.session, name="roles", endpoint="roles"))
+admin.add_view(ModelView(Students, db.session, name="Studentss", endpoint="Studentss"))
+# admin.add_view(ModelView(Permission, db.session, name="Permissions", endpoint="Permissions"))
+admin.add_view(ModelView(Post, db.session, name="Posts", endpoint="Posts"))
+admin.add_view(ModelView(Comment, db.session, name="Comments", endpoint="Comments"))
+admin.add_view(ModelView(Like, db.session, name="Likes", endpoint="Likes"))
+admin.add_view(ModelView(Notification, db.session, name="Notifications", endpoint="Notifications"))
+admin.add_view(ModelView(Transaction, db.session, name="Transactions", endpoint="Transactions"))
+admin.add_view(ModelView(Activity, db.session, name="Activities", endpoint="Activities"))
+admin.add_view(FileAdmin("."))