Merge branch 'v2' into pr_5

# Conflicts:
#	applications/view/__init__.py

applications/view/admin/admin_log.py

@@ -3,7 +3,8 @@ from sqlalchemy import desc
 
 from applications.common.utils.http import table_api
 from applications.common.utils.rights import authorize
-from applications.models import AdminLog, LogSchema
+from applications.models import AdminLog
+from applications.schemas import LogSchema
 from applications.common.curd import model_to_dicts
 
 admin_log = Blueprint('adminLog', __name__, url_prefix='/admin/log')

applications/view/admin/dict.py

@@ -1,5 +1,4 @@
 from flask import Blueprint, render_template, request, jsonify
-
 from applications.common.utils.http import table_api, success_api, fail_api
 from applications.common.utils.rights import authorize
 from applications.common.utils.validate import xss_escape

applications/view/department/__init__.py

@@ -4,7 +4,7 @@ from marshmallow import INCLUDE
 from applications.common.utils.http import success_api, fail_api
 from applications.common.utils.rights import authorize
 from applications.common.utils.validate import check_data
-from applications.models import DeptSchema
+from applications.schemas import DeptSchema
 from applications.common.admin import dept_curd as dept_curd
 
 dept_bp = Blueprint('dept', __name__, url_prefix='/dept')

applications/view/index/__init__.py

@@ -1,6 +1,4 @@
-from flask import Blueprint
-
-index_bp = Blueprint('Index', __name__, url_prefix='/')
+from applications.view.index.index import index_bp
 
 from . import index
 

applications/view/index/index.py

@@ -1,6 +1,6 @@
-from flask import render_template
+from flask import render_template, Blueprint
 
-from . import index_bp
+index_bp = Blueprint('Index', __name__, url_prefix='/')
 
 
 @index_bp.route('/')