ref: 2.3.グループ管理連携機能開発: Fix travis error

Author: tma-hcphat

api_tests/nodes/views/test_node_mapcore_group_views.py

@@ -23,6 +23,7 @@ def setUp(self):
         self.node = ProjectFactory(creator=self.admin_user, is_public=False)
         self.node.add_contributor(self.user, permissions='admin')
         self.node.add_contributor(self.read_only_user, permissions='read')
+        self.node.add_addon('groups', auth=Auth(self.user))  # Enable groups addon
         self.node.save()
 
         # Create auth groups for the node
@@ -766,8 +767,9 @@ def test_has_permission_mapcore_grants_and_denies(self):
         from osf.models.node import NodeGroupObjectPermission
 
         node = ProjectFactory()
-        # user that will be "in" the mapcore group
         mapcore_user = UserFactory()
+        node.add_addon('groups', auth=Auth(mapcore_user))  # Enable groups addon
+        # user that will be "in" the mapcore group
         # other user not in group
         other_user = UserFactory()
 
@@ -796,7 +798,9 @@ def test_has_permission_by_is_admin_group_parent(self):
 
         # Create a root node and a child node
         root = ProjectFactory()
+        root.add_addon('groups', auth=Auth(root.creator))  # Enable groups addon on root
         child = NodeFactory(creator=root.creator, parent=root)
+        child.add_addon('groups', auth=Auth(root.creator))  # Enable groups addon on child
 
         # Users
         mapcore_user = UserFactory()
@@ -843,6 +847,7 @@ def test_get_permissions_mapcore_includes_and_excludes(self):
         from osf.models.node import NodeGroupObjectPermission
 
         node = ProjectFactory()
+        node.add_addon('groups', auth=Auth(node.creator))  # Enable groups addon
         mapcore_user = UserFactory()
         other_user = UserFactory()
 
@@ -991,6 +996,7 @@ def test_has_permission_parent_admin_via_mapcore_groups_addon_disabled(self):
         from osf.models.node import NodeGroupObjectPermission
 
         root = ProjectFactory()
+        root.add_addon('groups', auth=Auth(root.creator))  # Enable groups addon on root
         child = NodeFactory(creator=root.creator, parent=root)
         mapcore_user = UserFactory()
 

osf/models/mixins.py

@@ -1944,7 +1944,10 @@ def has_permission(self, user, permission, check_parent=True):
         """
         object_type = self.guardian_object_type
         group_perm = []
-        enabled_groups = self.mapcore_groups_addon_enabled()
+        enabled_groups = False
+        if hasattr(self, 'mapcore_groups_addon_enabled'):
+            enabled_groups = self.mapcore_groups_addon_enabled()
+
         # Also check Auth Groups linked via MapCoreNodeGroup (by auth_group id)
         if object_type == 'node' and enabled_groups:
             try:
@@ -1999,7 +2002,9 @@ def get_permissions(self, user):
         # Overrides guardian mixin - returns readable perms instead of literal perms
         if isinstance(user, AnonymousUser):
             return []
-        enabled_groups = self.mapcore_groups_addon_enabled()
+        enabled_groups = False
+        if hasattr(self, 'mapcore_groups_addon_enabled'):
+            enabled_groups = self.mapcore_groups_addon_enabled()
         group_perms = []
         # Also check Auth Groups linked via MapCoreNodeGroup (by auth_group id) if node and groups addon enabled
         if enabled_groups:

website/project/views/node.py

@@ -921,7 +921,9 @@ def _view_project(node, auth, primary=False,
     is_registration = node.is_registration
     timestamp_pattern = get_timestamp_pattern_division(auth, node)
     mapcore_groups = utils.serialize_mapcore_node_groups(node, visible_only=True)
-    enabled_mapcore_groups = node.mapcore_groups_addon_enabled()
+    enabled_mapcore_groups = False
+    if hasattr(node, 'mapcore_groups_addon_enabled'):
+        enabled_mapcore_groups = node.mapcore_groups_addon_enabled()
     data = {
         'node': {
             'disapproval_link': disapproval_link,

website/views.py

@@ -141,7 +141,9 @@ def serialize_node_summary(node, auth, primary=True, show_path=False):
     if node.can_view(auth):
         contributor_data = serialize_contributors_for_summary(node)
         mapcore_group_data = serialize_mapcore_group_for_summary(node)
-        enabled_mapcore_groups = node.mapcore_groups_addon_enabled()
+        enabled_mapcore_groups = False
+        if hasattr(node, 'mapcore_groups_addon_enabled'):
+            enabled_mapcore_groups = node.mapcore_groups_addon_enabled()
         summary.update({
             'can_view': True,
             'can_edit': node.can_edit(auth),