From c0e8ff86202e2669df221123690fa5fcc2ec57ee Mon Sep 17 00:00:00 2001
From: yumaojun <719118794@qq.com>
Date: Wed, 16 Mar 2016 23:03:43 +0800
Subject: [PATCH] =?UTF-8?q?fix=20(jperm):=20=20=20=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7=20?=
 =?UTF-8?q?=E4=BB=85=E4=BD=BF=E7=94=A8=E7=A7=98=E9=92=A5=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E9=80=9A=E4=BF=A1=EF=BC=8C=20=E5=B7=B2=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=88=B7=E4=B8=8D=E4=BC=9A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. perm_role_add 同上 保留 密码选项
2. perm_role_edit 同上 保留 密码选项
3. 仅保持入数据，不设计远程操作

close #100
close #127
---
 templates/jperm/perm_role_add.html  | 14 +++++++-------
 templates/jperm/perm_role_edit.html | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/templates/jperm/perm_role_add.html b/templates/jperm/perm_role_add.html
index e2af64104..59ec3b3b6 100644
--- a/templates/jperm/perm_role_add.html
+++ b/templates/jperm/perm_role_add.html
@@ -40,13 +40,13 @@
                                 </div>
                             </div>
                             <div class="hr-line-dashed"></div>
-{#                            <div class="form-group">#}
-{#                                <label for="role_password" class="col-sm-2 control-label">用户密码</label>#}
-{#                                <div class="col-sm-8">#}
-{#                                    <input id="role_password" name="role_password" placeholder="Role Password" type="password" class="form-control">#}
-{#                                    <span class="help-block m-b-none">如果不添加密码，会自动生成</span>#}
-{#                                </div>#}
-{#                            </div>#}
+                            <div class="form-group">
+                                <label for="role_password" class="col-sm-2 control-label">用户密码</label>
+                                <div class="col-sm-8">
+                                    <input id="role_password" name="role_password" placeholder="Role Password" type="password" class="form-control">
+                                    <span class="help-block m-b-none">如果不添加密码，会自动生成</span>
+                                </div>
+                            </div>
                             <div class="form-group">
                                 <label for="role_key" class="col-sm-2 control-label">用户密钥</label>
                                 <div class="col-sm-8">
diff --git a/templates/jperm/perm_role_edit.html b/templates/jperm/perm_role_edit.html
index 00ff59eda..420eb300a 100644
--- a/templates/jperm/perm_role_edit.html
+++ b/templates/jperm/perm_role_edit.html
@@ -40,13 +40,13 @@
                                 </div>
                             </div>
                             <div class="hr-line-dashed"></div>
-{#                            <div class="form-group">#}
-{#                                <label for="role_password" class="col-sm-2 control-label">用户密码</label>#}
-{#                                <div class="col-sm-8">#}
-{#                                    <input id="role_password" name="role_password" type="password" class="form-control">#}
-{#                                    <span class="help-block m-b-none">不修改请留空</span>#}
-{#                                </div>#}
-{#                            </div>#}
+                            <div class="form-group">
+                                <label for="role_password" class="col-sm-2 control-label">用户密码</label>
+                                <div class="col-sm-8">
+                                    <input id="role_password" name="role_password" type="password" class="form-control">
+                                    <span class="help-block m-b-none">不修改请留空</span>
+                                </div>
+                            </div>
                             <div class="hr-line-dashed"></div>
                             <div class="form-group">
                                 <label for="role_key" class="col-sm-2 control-label">用户密钥</label>