github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-07 11:59:18 +00:00
Code Issues Projects Releases Wiki Activity

[Update] 换做lazyproperty

Browse Source
This commit is contained in:
ibuler 2019-11-19 10:26:01 +08:00
parent 3fc30aa96c
commit 4dc5d7d70e
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/users/models/user.py
View File

@ -10,7 +10,6 @@ from django.conf import settings
from django.contrib.auth.hashers import make_password from django.contrib.auth.hashers import make_password
from django.contrib.auth.models import AbstractUser from django.contrib.auth.models import AbstractUser
from django.core.cache import cache from django.core.cache import cache
from django.core.exceptions import ObjectDoesNotExist
from django.db import models from django.db import models
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
@ -18,7 +17,7 @@ from django.utils import timezone
from django.shortcuts import reverse from django.shortcuts import reverse
from orgs.utils import current_org from orgs.utils import current_org
from common.utils import get_signer, date_expired_default, get_logger from common.utils import get_signer, date_expired_default, get_logger, lazyproperty
from common import fields from common import fields
@ -217,7 +216,7 @@ class RoleMixin:
from orgs.models import Organization from orgs.models import Organization
return Organization.get_user_admin_or_audit_orgs(self) return Organization.get_user_admin_or_audit_orgs(self)
@property @lazyproperty
def is_org_admin(self): def is_org_admin(self):
if self.is_superuser or self.related_admin_orgs.exists(): if self.is_superuser or self.related_admin_orgs.exists():
return True return True

20
apps/users/templates/users/user_profile.html
View File

@ -173,16 +173,6 @@
</span> </span>
</td> </td>
</tr> </tr>
{% if request.user.can_update_password %}
<tr class="no-borders">
<td>{% trans 'Update password' %}:</td>
<td>
<span class="pull-right">
<a type="button" class="btn btn-primary btn-xs" style="width: 54px" href="{% url 'users:user-password-update' %}">{% trans 'Update' %}</a>
</span>
</td>
</tr>
{% endif %}
{% if request.user.mfa_enabled %} {% if request.user.mfa_enabled %}
<tr> <tr>
<td>{% trans 'Update MFA' %}:</td> <td>{% trans 'Update MFA' %}:</td>
@ -193,6 +183,16 @@
</td> </td>
</tr> </tr>
{% endif %} {% endif %}
{% if request.user.can_update_password %}
<tr class="no-borders">
<td>{% trans 'Update password' %}:</td>
<td>
<span class="pull-right">
<a type="button" class="btn btn-primary btn-xs" style="width: 54px" href="{% url 'users:user-password-update' %}">{% trans 'Update' %}</a>
</span>
</td>
</tr>
{% endif %}
{% if request.user.can_update_ssh_key %} {% if request.user.can_update_ssh_key %}
<tr> <tr>
<td>{% trans 'Update SSH public key' %}:</td> <td>{% trans 'Update SSH public key' %}:</td>