1. push role bug , because the password push is mandatory, so just the push key is option.

jasset/views.py

@@ -160,7 +160,7 @@ def asset_add(request):
                 asset_save = af_post.save(commit=False)
                 if not use_default_auth:
                     password = request.POST.get('password', '')
-                    password_encode = CRYPTOR.encrypt(password)
+                    password_encode = password
                     asset_save.password = password_encode
                 asset_save.is_active = True if is_active else False
                 asset_save.save()

jperm/views.py

@@ -326,10 +326,13 @@ def perm_role_push(request):
         task = Tasks(push_resource)
         ret = {}
         ret_failed = []
-        if password_push:
+
-            ret["password_push"] = task.add_multi_user(**role_pass)
+        # 因为要先建立用户，所以password 是必选项，
-            if ret["password_push"].get("status") != "success":
+        # 而push key是在 password也完成的情况下的 可选项
-                ret_failed.append(1)
+        ret["password_push"] = task.add_multi_user(**role_pass)
+        if ret["password_push"].get("status") != "success":
+            ret_failed.append(1)
+
         if key_push:
             ret["key_push"] = task.push_multi_key(**role_key)
             if ret["key_push"].get("status") != "success":

templates/jperm/perm_role_push.html

@@ -67,16 +67,6 @@
                             </div>
                             <div class="hr-line-dashed"></div>
                             <div class="row">
-                                <div class="form-group">
-                                    <label for="j_group" class="col-sm-2 control-label">使用密码</label>
-                                    <div class="col-sm-1">
-                                        <div class="radio i-checks">
-                                            <label>
-                                                <input type="checkbox"  value="1" id="use_password" name="use_password">
-                                            </label>
-                                        </div>
-                                    </div>
-                                </div>
                                 <div class="form-group">
                                     <label for="j_group" class="col-sm-2 control-label">使用秘钥</label>
                                     <div class="col-sm-1">