Skip to content

J
jumpserver
Commit cc9554cd authored by jym503558564's avatar jym503558564
Browse files
Options

[Update] 修改用户详情页中添加用户组标签的显示条件是：当前组织的普通用户或组管理员

parent 54887a34
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 38 deletions
apps/orgs/models.py
View file @ cc9554cd
...@@ -118,6 +118,11 @@ class Organization(models.Model): ...@@ -118,6 +118,11 @@ class Organization(models.Model):
return True return True
return False return False
def can_user_by(self, user):
if self.get_org_users().filter(id=user.id):
return True
return False
def is_real(self): def is_real(self):
return self.id not in (self.DEFAULT_NAME, self.ROOT_ID, self.SYSTEM_ID) return self.id not in (self.DEFAULT_NAME, self.ROOT_ID, self.SYSTEM_ID)
......
apps/users/models/user.py
View file @ cc9554cd
...@@ -217,6 +217,10 @@ class RoleMixin: ...@@ -217,6 +217,10 @@ class RoleMixin:
def can_audit_current_org(self): def can_audit_current_org(self):
return current_org.can_audit_by(self) return current_org.can_audit_by(self)
@property
def can_user_current_org(self):
return current_org.can_user_by(self)
@property @property
def can_admin_or_audit_current_org(self): def can_admin_or_audit_current_org(self):
return self.can_admin_current_org or self.can_audit_current_org return self.can_admin_current_org or self.can_audit_current_org
......
apps/users/templates/users/user_detail.html
View file @ cc9554cd
...@@ -211,46 +211,47 @@ ...@@ -211,46 +211,47 @@
</table> </table>
</div> </div>
</div> </div>
{% if request.user.can_admin_current_org %}
{% if user_object.can_user_current_org or user_object.can_admin_current_org %}
<div class="panel panel-info">
<div class="panel-heading">
<i class="fa fa-info-circle"></i> {% trans 'User group' %}
</div>
<div class="panel-body">
<table class="table group_edit">
<tbody>
<form>
<tr>
<td colspan="2" class="no-borders">
<select data-placeholder="{% trans 'Join user groups' %}" id="groups_selected" class="select2" style="width: 100%" multiple="" tabindex="4">
{% for group in groups %}
<option value="{{ group.id }}" id="opt_{{ group.id }}" >{{ group.name }}</option>
{% endfor %}
</select>
</td>
</tr>
<tr>
<td colspan="2" class="no-borders">
<button type="button" class="btn btn-info btn-small" id="btn_join_group">{% trans 'Join' %}</button>
</td>
</tr>
</form>
{% if request.user.can_admin_current_org and not user_object.can_audit_current_org%} {% for group in user_object.groups.all %}
<div class="panel panel-info"> <tr>
<div class="panel-heading"> <td >
<i class="fa fa-info-circle"></i> {% trans 'User group' %} <b class="bdg_group" data-gid={{ group.id }}>{{ group.name }}</b>
</td>
<td>
<button class="btn btn-danger pull-right btn-xs btn_leave_group" type="button"><i class="fa fa-minus"></i></button>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div> </div>
<div class="panel-body"> {% endif %}
<table class="table group_edit">
<tbody>
<form>
<tr>
<td colspan="2" class="no-borders">
<select data-placeholder="{% trans 'Join user groups' %}" id="groups_selected" class="select2" style="width: 100%" multiple="" tabindex="4">
{% for group in groups %}
<option value="{{ group.id }}" id="opt_{{ group.id }}" >{{ group.name }}</option>
{% endfor %}
</select>
</td>
</tr>
<tr>
<td colspan="2" class="no-borders">
<button type="button" class="btn btn-info btn-small" id="btn_join_group">{% trans 'Join' %}</button>
</td>
</tr>
</form>
{% for group in user_object.groups.all %}
<tr>
<td >
<b class="bdg_group" data-gid={{ group.id }}>{{ group.name }}</b>
</td>
<td>
<button class="btn btn-danger pull-right btn-xs btn_leave_group" type="button"><i class="fa fa-minus"></i></button>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
{% endif %} {% endif %}
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment