ki

controller/User.py

@@ -19,7 +19,7 @@ from django.views.decorators.csrf import csrf_exempt
 from django.utils.decorators import method_decorator
 from object.ResponseObject import ResponseObject
 from django.contrib.auth.hashers import make_password, check_password
-from model.models import UserModel
+from model.models import UserModel, LangSetModel
 import time
 from object.TokenObject import TokenObject
 
@@ -41,7 +41,6 @@ class registerView(TemplateView):
         username = request_dict.get('username', None)
         password = request_dict.get('password', None)
         if username and password:
-            pwd = make_password(password)
             nowTime = int(time.time())
             create_dict = {
                 'username': username,
@@ -103,6 +102,39 @@ class queryView(TemplateView):
         tko = TokenObject(token)
         if tko.code == 0:
             um_qs = UserModel.objects.filter().values('id', 'username')
+            # ls_qs = LangSetModel.objects.filter().values('user__id', 'lang__lang')
+            # res = []
+            # for um in um_qs:
+            #     um.langsetmodel_set.all()
+
+            return response.json(0, list(um_qs))
+        else:
+            return response.json(tko.code)
+
+
+class updateView(TemplateView):
+    def post(self, request, *args, **kwargs):
+        request.encoding = 'utf-8'
+        request_dict = json.loads(request.body.decode('utf-8'))
+        return self.validate(request_dict)
+
+    def get(self, request, *args, **kwargs):
+        request.encoding = 'utf-8'
+        request_dict = request.GET
+        return self.validate(request_dict)
+
+    def validate(self, request_dict):
+        response = ResponseObject()
+        token = request_dict.get('token', None)
+        la_list = request_dict.get('la_list', None)
+        tko = TokenObject(token)
+        if tko.code == 0:
+            um_qs = UserModel.objects.filter().values('id', 'username')
+            # ls_qs = LangSetModel.objects.filter().values('user__id', 'lang__lang')
+            # res = []
+            # for um in um_qs:
+            #     um.langsetmodel_set.all()
+
             return response.json(0, list(um_qs))
         else:
             return response.json(tko.code)

web/userTab.html

@@ -41,7 +41,7 @@
     <div class="top-bar">
         <ul>
             <li>
-                <a href="" title="Log Out">
+                <a href="login.html" title="Log Out">
                     <i class="fa fa-sign-out"></i>
                 </a>
             </li>