diff options
Diffstat (limited to 'ishtar_common/models.py')
| -rw-r--r-- | ishtar_common/models.py | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 9579cdbd1..8542c8963 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -175,7 +175,7 @@ from ishtar_common.models_common import ( OrderedHierarchicalType, OrderedType, OwnPerms, - PermissionRequest, + PermissionQuery, post_save_cache, QuickAction, SearchVectorConfig, @@ -201,7 +201,7 @@ __all__ = [ "ImporterDuplicateField", "Imported", "FilteredSheet", - "PermissionRequest", + "PermissionQuery", "Regexp", "ImportTarget", "ItemKey", @@ -3441,8 +3441,8 @@ class GDPRLog(models.Model): class ProfileType(GeneralType): groups = models.ManyToManyField(Group, verbose_name=_("Groups"), blank=True, related_name="profile_types") - permission_requests = models.ManyToManyField( - PermissionRequest, verbose_name=_("Permissions requests"), blank=True, + permission_queries = models.ManyToManyField( + PermissionQuery, verbose_name=_("Permissions queries"), blank=True, related_name="profile_types" ) filtered_sheets = models.ManyToManyField( @@ -3500,7 +3500,7 @@ post_save.connect(post_save_cache, sender=ProfileType) post_delete.connect(post_save_cache, sender=ProfileType) -def permission_requests_changed(sender, **kwargs): +def permission_queries_changed(sender, **kwargs): instance = kwargs.get("instance", None) if not instance: return @@ -3509,9 +3509,9 @@ def permission_requests_changed(sender, **kwargs): ).update(need_permission_update=True) -m2m_changed.connect(permission_requests_changed, - sender=ProfileType.permission_requests.through) -m2m_changed.connect(permission_requests_changed, +m2m_changed.connect(permission_queries_changed, + sender=ProfileType.permission_queries.through) +m2m_changed.connect(permission_queries_changed, sender=ProfileType.groups.through) @@ -3605,11 +3605,11 @@ class UserProfile(models.Model): new_item.external_sources.add(src) return new_item - def _generate_permission(self, ishtar_user, content_type, permission_request, + def _generate_permission(self, ishtar_user, content_type, permission_query, permissions, permission_type): item_ids = [] model_class = content_type.model_class() - if permission_request.include_associated_items: + if permission_query.include_associated_items: if hasattr(model_class, "ishtar_users"): item_ids += model_class.objects.filter( ishtar_users__pk=ishtar_user.pk @@ -3628,19 +3628,19 @@ class UserProfile(models.Model): ) # DEBUG # print("ishtar_common/models.py - 3578", item_ids, ishtar_user, content_type, permission_type) - if permission_request.include_upstream_items: + if permission_query.include_upstream_items: item_ids += model_class.get_ids_from_upper_permissions( ishtar_user.user_ptr.pk, permissions ) # DEBUG # print("ishtar_common/models.py - 3584", item_ids, ishtar_user, content_type, permission_type) - if permission_request.request or permission_request.limit_to_attached_areas: + if permission_query.request or permission_query.limit_to_attached_areas: _get_item = get_item( content_type.model_class(), "", "", no_permission_check=True, ) result = [] - query = permission_request.request + query = permission_query.request if query: if "{USER}" in query: query = query.replace("{USER}", f"id:{ishtar_user.person_id}") @@ -3648,7 +3648,7 @@ class UserProfile(models.Model): q = _get_item(None, return_query=True, ishtaruser=ishtar_user, query=query) result = list(q.values_list("pk", flat=True)) - if permission_request.limit_to_attached_areas: + if permission_query.limit_to_attached_areas: profile = ishtar_user.current_profile if not profile: # no areas attached return [] @@ -3699,7 +3699,7 @@ class UserProfile(models.Model): permissions += list(group.permissions.filter( codename__contains=permission_type ).all()) - q_req = self.profile_type.permission_requests.filter( + q_req = self.profile_type.permission_queries.filter( model=content_type, active=True ) item_ids = [] |