github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2026-01-29 21:51:31 +00:00
Code Issues Projects Releases Wiki Activity

fix (jperm): 统一调整系统用户 仅使用秘钥进行通信， 已存在的用户不会修改密码

Browse Source 
1. perm_role_push 模板取消密码选项，但是为了 那么留下秘钥推送可勾选，允许空推送
2. perm_role_add 同上 取消 密码选项
3. perm_role_edit 同上 取消 密码选项
4. views 调整role push add edit 相关视图
5. perm_api，调整 gen_resource，仅支持秘钥认证（是否需要支持密码认证，我觉得没必要，如果需要请提出)

close #100
close #127
This commit is contained in:
yumaojun
2016-03-16 22:30:39 +08:00
parent 6b39c9946b
commit ca75484eb8
6 changed files with 26 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
templates/jperm/perm_role_add.html
View File

@@ -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">

14
templates/jperm/perm_role_edit.html
View File

@@ -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>

10
templates/jperm/perm_role_push.html
View File

@@ -74,16 +74,6 @@
</div>
</div>
</div>
<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>
<div class="hr-line-dashed"></div>
<div class="form-group">