Merge PR openedx#34728 'chris/FAL-3720-update-remove-object-tag-permi…

…ssion' into taxonomy-sandbox-20240508

openedx/core/djangoapps/content_tagging/rules.py

@@ -273,6 +273,30 @@ def can_view_object_tag_objectid(user: UserType, object_id: str) -> bool:
     return bool(object_org) and (is_org_admin(user, object_org) or is_org_user(user, object_org))
 
 
+@rules.predicate
+def can_remove_object_tag_objectid(user: UserType, object_id: str) -> bool:
+    """
+    Everyone that has permission to edit the object should be able remove tags from it.
+    """
+    if not object_id:
+        raise ValueError("object_id must be provided")
+
+    if not user.is_authenticated:
+        return False
+
+    try:
+        context_key = get_context_key_from_key_string(object_id)
+        assert context_key.org
+    except (ValueError, AssertionError):
+        return False
+
+    if has_studio_write_access(user, context_key):
+        return True
+
+    object_org = rules_cache.get_orgs([context_key.org])
+    return bool(object_org) and is_org_admin(user, object_org)
+
+
 @rules.predicate
 def can_change_object_tag(
     user: UserType, perm_obj: oel_tagging.ObjectTagPermissionItem | None = None
@@ -336,3 +360,4 @@ def can_change_taxonomy_tag(user: UserType, tag: oel_tagging.Tag | None = None)
 rules.set_perm("oel_tagging.view_objecttag_objectid", can_view_object_tag_objectid)
 rules.set_perm("oel_tagging.change_objecttag_taxonomy", can_view_object_tag_taxonomy)
 rules.set_perm("oel_tagging.change_objecttag_objectid", can_change_object_tag_objectid)
+rules.set_perm("oel_tagging.remove_objecttag_objectid", can_remove_object_tag_objectid)

requirements/constraints.txt

@@ -97,7 +97,7 @@ libsass==0.10.0
 click==8.1.6
 
 # pinning this version to avoid updates while the library is being developed
-openedx-learning==0.9.2
+openedx-learning==0.9.3
 
 # Open AI version 1.0.0 dropped support for openai.ChatCompletion which is currently in use in enterprise.
 openai<=0.28.1

requirements/edx/base.txt

@@ -792,7 +792,7 @@ openedx-filters==1.8.1
     #   -r requirements/edx/kernel.in
     #   lti-consumer-xblock
     #   ora2
-openedx-learning==0.9.2
+openedx-learning==0.9.3
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in

requirements/edx/development.txt

@@ -1312,7 +1312,7 @@ openedx-filters==1.8.1
     #   -r requirements/edx/testing.txt
     #   lti-consumer-xblock
     #   ora2
-openedx-learning==0.9.2
+openedx-learning==0.9.3
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt

requirements/edx/doc.txt

@@ -928,7 +928,7 @@ openedx-filters==1.8.1
     #   -r requirements/edx/base.txt
     #   lti-consumer-xblock
     #   ora2
-openedx-learning==0.9.2
+openedx-learning==0.9.3
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt

requirements/edx/testing.txt

@@ -983,7 +983,7 @@ openedx-filters==1.8.1
     #   -r requirements/edx/base.txt
     #   lti-consumer-xblock
     #   ora2
-openedx-learning==0.9.2
+openedx-learning==0.9.3
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt