|
|
@@ -59,18 +59,14 @@ from desktop.lib.idbroker.conf import is_idbroker_enabled
|
|
|
from desktop.monkey_patches import monkey_patch_username_validator
|
|
|
|
|
|
from useradmin.conf import DEFAULT_USER_GROUP
|
|
|
+from useradmin.models2 import Organization
|
|
|
from useradmin.permissions import HuePermission, GroupPermission, LdapGroup
|
|
|
|
|
|
if ENABLE_ORGANIZATIONS.get():
|
|
|
- from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group, Organization, get_organization
|
|
|
- from useradmin.organization import _fitered_queryset, get_user_request_organization, default_organization
|
|
|
+ from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group, get_organization
|
|
|
else:
|
|
|
from django.contrib.auth.models import User, Group
|
|
|
- class Organization(): pass
|
|
|
- def default_organization(): pass
|
|
|
def get_organization(): pass
|
|
|
- def _fitered_queryset(queryset, *args, **kwargs): return queryset
|
|
|
- def get_user_request_organization(): pass
|
|
|
|
|
|
monkey_patch_username_validator()
|
|
|
|