Merge pull request #3449 from jumpserver/user_detail_template

[Update] 修改用户详情页中用户组标签不显示的问题

apps/orgs/models.py

@@ -118,6 +118,11 @@ class Organization(models.Model):
             return True
         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):
         return self.id not in (self.DEFAULT_NAME, self.ROOT_ID, self.SYSTEM_ID)
 

apps/users/models/user.py

@@ -217,6 +217,10 @@ class RoleMixin:
     def can_audit_current_org(self):
         return current_org.can_audit_by(self)
 
+    @property
+    def can_user_current_org(self):
+        return current_org.can_user_by(self)
+
     @property
     def can_admin_or_audit_current_org(self):
         return self.can_admin_current_org or self.can_audit_current_org

apps/users/templates/users/user_detail.html

@@ -211,8 +211,8 @@
                                     </table>
                                 </div>
                             </div>
-
+                            {% if request.user.can_admin_current_org %}
-                            {% if user_object.is_current_org_admin %}
+                                {% 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' %}
@@ -252,6 +252,7 @@
                                         </div>
                                     </div>
                                 {% endif %}
+                            {% endif %}
                         </div>
                     </div>
                 </div>