Merge pull request shiyanlou#10 from tongxindao/tongxindao

protream · web-flow · commit 045fe8564891 · 2018-01-12T09:31:54.000+08:00
Tongxindao
diff --git a/23-optimize-login-and-register/simpledu/simpledu/handlers/front.py b/23-optimize-login-and-register/simpledu/simpledu/handlers/front.py
@@ -36,6 +36,7 @@ def register():
     if form.validate_on_submit():
         if not form.username.data.isalnum():
             flash('用户名只能由字母和数字组成')
+            return redirect(url_for('.register'))
         form.create_user()
         flash('register success', 'success')
         return redirect(url_for('.login'))
diff --git a/23-optimize-login-and-register/simpledu/simpledu/templates/base.html b/23-optimize-login-and-register/simpledu/simpledu/templates/base.html
@@ -35,7 +35,7 @@
 	  <ul class="dropdown-menu">
 		<li><a href="#">Profile</a></li>
 		<li role="separator" class="divider"></li>
-		<li><a href="#">Logout</a></li>
+		<li><a href="{{ url_for('front.logout') }}">Logout</a></li>
     </ul>
 	</li>
   {% endif %}
diff --git a/24-add-user-management-module/simpledu/simpledu/handlers/admin.py b/24-add-user-management-module/simpledu/simpledu/handlers/admin.py
@@ -1,4 +1,5 @@
 from flask import Blueprint, render_template, request, current_app, redirect, url_for, flash
+from flask_login import current_user
 from simpledu.decorators import admin_required
 from simpledu.models import db, Course, User
 from simpledu.forms import CourseForm, RegisterForm
@@ -92,6 +93,9 @@ def edit_user(user_id):
 @admin.route('/users/<int:user_id>/delete', methods=['GET', 'POST'])
 @admin_required
 def delete_user(user_id):
+    if current_user.id == user_id:
+        flash("用户不能自我删除", "error")
+        return redirect(url_for('admin.users'))
     user = User.query.get_or_404(user_id)
     db.session.delete(user)
     db.session.commit()
