Merge branch 'master' of ssh://192.168.136.45:10022/SERVER/langer

controller/SkuConditionName.py

@@ -42,7 +42,7 @@ class skuConditionView(TemplateView):
             user_qs = UserModel.objects.filter(id=userID)
             if not user_qs.exists():
                 return response.json(403)
-            if user_qs[0].username == "admin":
+            if user_qs[0].role_id == "admin":
                 if operation == 'add':
                     return self.do_add(request_dict, response)
                 elif operation == 'update':

controller/SkuRuleName.py

@@ -42,7 +42,7 @@ class skuRuleView(TemplateView):
             user_qs = UserModel.objects.filter(id=userID)
             if not user_qs.exists():
                 return response.json(403)
-            if user_qs[0].username == "admin":
+            if user_qs[0].role_id == "admin":
                 if operation == 'add':
                     return self.do_add(request_dict, response)
                 elif operation == 'update':

controller/SkuSuitName.py

@@ -41,7 +41,7 @@ class skuSuitView(TemplateView):
         if tko.code == 0:
             userID = tko.userID
             user_qs = UserModel.objects.filter(id=userID)
-            if user_qs[0].username == "admin":
+            if user_qs[0].role_id == "admin":
                 if operation == 'add':
                     return self.do_add(request_dict, response)
                 elif operation == 'update':