github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-10-23 00:38:39 +00:00
Code Issues Projects Releases Wiki Activity

[Update] 修改get_current_org 为 proxy对象 current_org

Browse Source
This commit is contained in:
ibuler
2018-07-20 17:49:47 +08:00
parent b5f6f80ae6
commit e3aa18ff2d
18 changed files with 171 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/users/forms.py
View File

@@ -7,7 +7,7 @@ from captcha.fields import CaptchaField
from common.utils import validate_ssh_public_key
from orgs.mixins import OrgModelForm
from orgs.utils import get_current_org
from orgs.utils import current_org
from .models import User, UserGroup
@@ -279,8 +279,7 @@ class UserBulkUpdateForm(forms.ModelForm):
def user_limit_to():
org = get_current_org()
return {"orgs": org}
return {"orgs": current_org}
class UserGroupForm(forms.ModelForm):
@@ -308,7 +307,6 @@ class UserGroupForm(forms.ModelForm):
return
users_field = self.fields.get('users')
if hasattr(users_field, 'queryset'):
current_org = get_current_org()
users_field.queryset = current_org.get_org_users()
def save(self, commit=True):