Merge pull request #1121 from rdmorganiser/interview-visibility

feat(interview): Project visibility [1]

Author: jochenklar

rdmo/core/settings.py

@@ -200,6 +200,7 @@
     'MULTISITE',
     'GROUPS',
     'EXPORT_FORMATS',
+    'PROJECT_VISIBILITY',
     'PROJECT_ISSUES',
     'PROJECT_VIEWS',
     'PROJECT_EXPORTS',
@@ -296,6 +297,8 @@
 
 PROJECT_TABLE_PAGE_SIZE = 20
 
+PROJECT_VISIBILITY = True
+
 PROJECT_ISSUES = True
 
 PROJECT_ISSUE_PROVIDERS = []

rdmo/core/templates/core/bootstrap_form.html

@@ -6,6 +6,11 @@
 
         {% include 'core/bootstrap_form_fields.html' %}
 
+        {% if submit %}
         <input type="submit" value="{{ submit }}" class="btn btn-primary" />
+        {% endif %}
+        {% if delete %}
+        <input type="submit" name="delete" value="{{ delete }}" class="btn btn-danger" />
+        {% endif %}
         <input type="submit" name="cancel" value="{% trans 'Cancel' %}" class="btn" />
     </form>

rdmo/core/templates/core/bootstrap_form_field.html

@@ -1,3 +1,4 @@
+{% load i18n %}
 {% load widget_tweaks %}
 {% load core_tags %}
 
@@ -61,6 +62,12 @@
 
     {% render_field field class="form-control" %}
 
+    {% if type == 'selectmultiple' %}
+    <p class="help-block">
+    {% trans 'Hold down "Control", or "Command" on a Mac, to select more than one.' %}
+    </p>
+    {% endif %}
+
     {% endif %}
     {% endwith %}
 

rdmo/core/templatetags/core_tags.py

@@ -114,6 +114,9 @@ def bootstrap_form(context, **kwargs):
     if 'submit' in kwargs:
         form_context['submit'] = kwargs['submit']
 
+    if 'delete' in kwargs:
+        form_context['delete'] = kwargs['delete']
+
     return render_to_string('core/bootstrap_form.html', form_context, request=context.request)
 
 

rdmo/projects/admin.py

@@ -3,6 +3,7 @@
 from django.db.models import Prefetch
 from django.urls import reverse
 from django.utils.safestring import mark_safe
+from django.utils.translation import gettext_lazy as _
 
 from .models import (
     Continuation,
@@ -15,6 +16,7 @@
     Project,
     Snapshot,
     Value,
+    Visibility,
 )
 from .validators import ProjectParentValidator
 
@@ -71,6 +73,25 @@ class ContinuationAdmin(admin.ModelAdmin):
     list_display = ('project', 'user', 'page')
 
 
+@admin.register(Visibility)
+class VisibilityAdmin(admin.ModelAdmin):
+    search_fields = ('project__title', 'sites', 'groups')
+    list_display = ('project', 'sites_list_display', 'groups_list_display')
+    filter_horizontal = ('sites', 'groups')
+
+    @admin.display(description=_('Sites'))
+    def sites_list_display(self, obj):
+        return _('all Sites') if obj.sites.count() == 0 else ', '.join([
+            site.domain for site in obj.sites.all()
+        ])
+
+    @admin.display(description=_('Groups'))
+    def groups_list_display(self, obj):
+        return _('all Groups') if obj.groups.count() == 0 else ', '.join([
+            group.name for group in obj.groups.all()
+        ])
+
+
 @admin.register(Integration)
 class IntegrationAdmin(admin.ModelAdmin):
     search_fields = ('project__title', 'provider_key')

rdmo/projects/filters.py

@@ -1,3 +1,4 @@
+from django.contrib.auth.models import User
 from django.db.models import F, OuterRef, Q, Subquery
 from django.db.models.functions import Concat
 from django.utils.dateparse import parse_datetime
@@ -18,6 +19,22 @@ class Meta:
         fields = ('title', 'catalog')
 
 
+class ProjectUserFilterBackend(BaseFilterBackend):
+
+    def filter_queryset(self, request, queryset, view):
+        if view.detail:
+            return queryset
+
+        user_id = request.GET.get('user')
+        user_username = request.GET.get('username')
+        if user_id or user_username:
+            user = User.objects.filter(Q(id=user_id) | Q(username=user_username)).first()
+            if user:
+                queryset = queryset.filter_visibility(user)
+
+        return queryset
+
+
 class ProjectSearchFilterBackend(SearchFilter):
 
     def filter_queryset(self, request, queryset, view):

rdmo/projects/forms.py

@@ -12,7 +12,7 @@
 from rdmo.core.utils import markdown2html
 
 from .constants import ROLE_CHOICES
-from .models import Integration, IntegrationOption, Invite, Membership, Project, Snapshot
+from .models import Integration, IntegrationOption, Invite, Membership, Project, Snapshot, Visibility
 from .validators import ProjectParentValidator
 
 
@@ -98,6 +98,48 @@ class Meta:
         fields = ('title', 'description')
 
 
+class ProjectUpdateVisibilityForm(forms.ModelForm):
+
+    use_required_attribute = False
+
+    def __init__(self, *args, **kwargs):
+        self.project = kwargs.pop('instance')
+        try:
+            instance = self.project.visibility
+        except Visibility.DoesNotExist:
+            instance = None
+
+        super().__init__(*args, instance=instance, **kwargs)
+
+        # remove the sites or group sets if they are not needed, doing this in Meta would break tests
+        if not settings.MULTISITE:
+            self.fields.pop('sites')
+        if not settings.GROUPS:
+            self.fields.pop('groups')
+
+    class Meta:
+        model = Visibility
+        fields = ('sites', 'groups')
+
+    def save(self, *args, **kwargs):
+        if 'cancel' in self.data:
+            pass
+        elif 'delete' in self.data:
+            self.instance.delete()
+        else:
+            visibility, created = Visibility.objects.update_or_create(project=self.project)
+
+            sites = self.cleaned_data.get('sites')
+            if sites is not None:
+                visibility.sites.set(sites)
+
+            groups = self.cleaned_data.get('groups')
+            if groups is not None:
+                visibility.groups.set(groups)
+
+        return self.project
+
+
 class ProjectUpdateCatalogForm(forms.ModelForm):
 
     use_required_attribute = False

rdmo/projects/managers.py

@@ -21,13 +21,20 @@ def filter_user(self, user):
             elif is_site_manager(user):
                 return self.filter_current_site()
             else:
-                queryset = self.filter(user=user)
+                queryset = self.filter_visibility(user)
                 for instance in queryset:
                     queryset |= instance.get_descendants()
                 return queryset.distinct()
         else:
             return self.none()
 
+    def filter_visibility(self, user):
+        groups = user.groups.all()
+        sites_filter = Q(visibility__sites=None) | Q(visibility__sites=settings.SITE_ID)
+        groups_filter = Q(visibility__groups=None) | Q(visibility__groups__in=groups)
+        visibility_filter = Q(visibility__isnull=False) & sites_filter & groups_filter
+        return self.filter(Q(user=user) | visibility_filter)
+
 
 class MembershipQuerySet(models.QuerySet):
 
@@ -157,6 +164,9 @@ def get_queryset(self):
     def filter_user(self, user):
         return self.get_queryset().filter_user(user)
 
+    def filter_visibility(self, user):
+        return self.get_queryset().filter_visibility(user)
+
 
 class MembershipManager(CurrentSiteManagerMixin, models.Manager):
 

rdmo/projects/migrations/0062_visibility.py

@@ -0,0 +1,32 @@
+# Generated by Django 4.2.16 on 2024-12-06 10:11
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+        ('sites', '0002_alter_domain_unique'),
+        ('projects', '0061_alter_value_value_type'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Visibility',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', models.DateTimeField(editable=False, verbose_name='created')),
+                ('updated', models.DateTimeField(editable=False, verbose_name='updated')),
+                ('groups', models.ManyToManyField(blank=True, help_text='The groups for which the project is visible.', to='auth.group', verbose_name='Group')),
+                ('project', models.OneToOneField(help_text='The project for this visibility.', on_delete=django.db.models.deletion.CASCADE, to='projects.project', verbose_name='Project')),
+                ('sites', models.ManyToManyField(blank=True, help_text='The sites for which the project is visible (in a multi site setup).', to='sites.site', verbose_name='Sites')),
+            ],
+            options={
+                'verbose_name': 'Visibility',
+                'verbose_name_plural': 'Visibilities',
+                'ordering': ('project',),
+            },
+        ),
+    ]

rdmo/projects/models/__init__.py

@@ -6,3 +6,4 @@
 from .project import Project
 from .snapshot import Snapshot
 from .value import Value
+from .visibility import Visibility