Browse Source

Merge pull request #114 from falconbaby/master

fix(screen/team/user): strip space when add or edit data
laiwei 6 years ago
parent
commit
20448f9168
4 changed files with 26 additions and 26 deletions
  1. 3 3
      rrd/view/auth/auth.py
  2. 4 4
      rrd/view/dashboard/screen.py
  3. 3 3
      rrd/view/team/team.py
  4. 16 16
      rrd/view/user/user.py

+ 3 - 3
rrd/view/auth/auth.py

@@ -98,9 +98,9 @@ def auth_register():
     if request.method == "POST":
         ret = {"msg":""}
 
-        name = request.form.get("name", "")
-        cnname = request.form.get("cnname", "")
-        email = request.form.get("email", "")
+        name = request.form.get("name", "").strip()
+        cnname = request.form.get("cnname", "").strip()
+        email = request.form.get("email", "").strip()
         password = request.form.get("password", "")
         repeat_password = request.form.get("repeat_password", "")
 

+ 4 - 4
rrd/view/dashboard/screen.py

@@ -52,7 +52,7 @@ def dash_screen_edit(sid):
         abort(404, "no such screen")
 
     if request.method == "POST":
-        screen_name = request.form.get("screen_name")
+        screen_name = request.form.get("screen_name").strip()
         screen.update(name=screen_name)
         return redirect("/screen/%s" %screen.id)
     else:
@@ -65,7 +65,7 @@ def dash_screen_clone(sid):
         abort(404, "no such screen")
 
     if request.method == "POST":
-        screen_name = request.form.get("screen_name")
+        screen_name = request.form.get("screen_name").strip()
         with_graph = request.form.get("with_graph")
 
         new_s = DashboardScreen.add(screen.pid, screen_name)
@@ -147,7 +147,7 @@ def dash_screen_embed(sid):
 @app.route("/screen/add", methods=["GET", "POST"])
 def dash_screen_add():
     if request.method == "POST":
-        name = request.form.get("screen_name")
+        name = request.form.get("screen_name").strip()
         pid = request.form.get("pid", '0')
         screen = DashboardScreen.add(pid, name)
         return redirect("/screen/%s" % screen.id)
@@ -173,7 +173,7 @@ def dash_graph_add(sid):
     pscreen = DashboardScreen.get(screen.pid)
 
     if request.method == "POST":
-        title = request.form.get("title")
+        title = request.form.get("title").strip()
 
         hosts = request.form.get("hosts", "").strip()
         hosts = hosts and hosts.split("\n") or []

+ 3 - 3
rrd/view/team/team.py

@@ -53,8 +53,8 @@ def team_create():
     if request.method == "POST":
         ret = {"msg":""}
 
-        name = request.form.get("name", "")
-        resume = request.form.get("resume", "")
+        name = request.form.get("name", "").strip()
+        resume = request.form.get("resume", "").strip()
         users = request.form.get("users", "")
 
         user_ids = users and users.split(",") or []
@@ -82,7 +82,7 @@ def team_edit(team_id):
     if request.method == "POST":
         ret = {"msg":""}
 
-        resume = request.form.get("resume", "")
+        resume = request.form.get("resume", "").strip()
         users = request.form.get("users", "")
 
         user_ids = users and users.split(",") or []

+ 16 - 16
rrd/view/user/user.py

@@ -42,11 +42,11 @@ def user_profile():
     if request.method == "POST":
         ret = {"msg":""}
 
-        cnname = request.form.get("cnname", "")
-        email = request.form.get("email", "")
-        im = request.form.get("im", "")
-        phone = request.form.get("phone", "")
-        qq = request.form.get("qq", "")
+        cnname = request.form.get("cnname", "").strip()
+        email = request.form.get("email", "").strip()
+        im = request.form.get("im", "").strip()
+        phone = request.form.get("phone", "").strip()
+        qq = request.form.get("qq", "").strip()
 
         d = {
                 "cnname": cnname,
@@ -121,13 +121,13 @@ def user_create():
     if request.method == "POST":
         ret = {"msg":""}
 
-        name = request.form.get("name", "")
-        cnname = request.form.get("cnname", "")
+        name = request.form.get("name", "").strip()
+        cnname = request.form.get("cnname", "").strip()
         password = request.form.get("password", "")
-        email = request.form.get("email", "")
-        phone = request.form.get("phone", "")
-        im = request.form.get("im", "")
-        qq = request.form.get("qq", "")
+        email = request.form.get("email", "").strip()
+        phone = request.form.get("phone", "").strip()
+        im = request.form.get("im", "").strip()
+        qq = request.form.get("qq", "").strip()
 
         if not name or not cnname or not password or not email:
             ret["msg"] = "not all form item entered"
@@ -161,11 +161,11 @@ def admin_user_edit(user_id):
             return json.dumps(ret)
 
         user_id = request.form.get("id", "")
-        cnname = request.form.get("cnname", "")
-        email = request.form.get("email", "")
-        phone = request.form.get("phone", "")
-        im = request.form.get("im", "")
-        qq = request.form.get("qq", "")
+        cnname = request.form.get("cnname", "").strip()
+        email = request.form.get("email", "").strip()
+        phone = request.form.get("phone", "").strip()
+        im = request.form.get("im", "").strip()
+        qq = request.form.get("qq", "").strip()
 
         d = {
             "user_id": int(user_id), "cnname": cnname, "email": email, "phone": phone, "im": im, "qq": qq,