From e9dfd7b395c78899b6dea5723efc45c2b81bddbc Mon Sep 17 00:00:00 2001
From: Peidong Liu <lpd1995@126.com>
Date: Mon, 4 Apr 2016 21:13:19 +0800
Subject: [PATCH] Now updating userinfo take effects immediately Change
 background color of profile and signout button

---
 web/templates/base_AdminLTE.html   |  2 +-
 web/webViews/authenticate/login.py | 22 ++++++++++++----------
 web/webViews/user/userinfo.py      |  2 ++
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/web/templates/base_AdminLTE.html b/web/templates/base_AdminLTE.html
index 51f6afc..43035b4 100644
--- a/web/templates/base_AdminLTE.html
+++ b/web/templates/base_AdminLTE.html
@@ -77,7 +77,7 @@
               <!-- Menu Body -->
 
               <!-- Menu Footer-->
-              <li class="user-footer">
+              <li class="user-footer" style="background-color:#e6e6e6">
                 <div class="pull-left">
                   <a href="/user/info/" class="btn btn-default btn-flat">Profile</a>
                 </div>
diff --git a/web/webViews/authenticate/login.py b/web/webViews/authenticate/login.py
index d54e70d..7d361bf 100755
--- a/web/webViews/authenticate/login.py
+++ b/web/webViews/authenticate/login.py
@@ -1,7 +1,7 @@
 from webViews.view import normalView
 from webViews.authenticate.auth import is_authenticated
 from webViews.dockletrequest import dockletRequest
-from flask import redirect, request, render_template, session, make_response
+from flask import redirect, request, render_template, session, make_response, abort
 from webViews import cookie_tool
 
 import hashlib
@@ -20,16 +20,18 @@ if (env.getenv('EXTERNAL_LOGIN') == 'True'):
     import external_generate
 
 def refreshInfo():
-    '''not used now'''
-    result = dockletRequest.post('/login/', data)
+    data = {}
+    result = dockletRequest.post('/user/selfQuery/', data)
     ok = result and result.get('success', None)
-    session['username'] = request.form['username']
-    session['nickname'] = result['data']['nickname']
-    session['description'] = result['data']['description'][0:10]
-    session['avatar'] = '/static/avatar/'+ result['data']['avatar']
-    session['usergroup'] = result['data']['group']
-    session['status'] = result['data']['status']
-    session['token'] = result['data']['token']
+    if (ok and ok == "true"):
+        session['username'] = result['data']['username']
+        session['nickname'] = result['data']['nickname']
+        session['description'] = result['data']['description']
+        session['avatar'] = '/static/avatar/'+ result['data']['avatar']
+        session['usergroup'] = result['data']['group']
+        session['status'] = result['data']['status']
+    else:
+        abort(404)
 
 class loginView(normalView):
     template_path = "login.html"
diff --git a/web/webViews/user/userinfo.py b/web/webViews/user/userinfo.py
index 5f6b792..665067d 100644
--- a/web/webViews/user/userinfo.py
+++ b/web/webViews/user/userinfo.py
@@ -1,5 +1,6 @@
 from flask import redirect, request
 from webViews.dockletrequest import dockletRequest
+from webViews.authenticate import login
 from webViews.view import normalView
 import json
 
@@ -15,4 +16,5 @@ class userinfoView(normalView):
     @classmethod
     def post(self):
         result =  json.dumps(dockletRequest.post('/user/selfModify/', request.form))
+        login.refreshInfo()
         return result