rdmo 2.0.2__tar.gz → 2.1.1__tar.gz

{rdmo-2.0.2/rdmo.egg-info → rdmo-2.1.1}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: rdmo
-Version: 2.0.2
+Version: 2.1.1
 Summary: RDMO is a tool to support the systematic planning, organisation and implementation of the data management throughout the course of a research project.
 Author-email: RDMO Arbeitsgemeinschaft <rdmo-team@listserv.dfn.de>
 License: Apache-2.0
-Project-URL: changelog, https://github.com/rdmorganiser/rdmo/blob/master/CHANGELOG.md
+Project-URL: changelog, https://github.com/rdmorganiser/rdmo/blob/main/CHANGELOG.md
 Project-URL: documentation, https://rdmo.readthedocs.io
 Project-URL: homepage, https://rdmorganiser.github.io
 Project-URL: issues, https://github.com/rdmorganiser/rdmo/issues
@@ -38,7 +38,7 @@ Requires-Dist: django-extensions~=3.2
 Requires-Dist: django-filter~=23.2
 Requires-Dist: django-libsass~=0.9
 Requires-Dist: django-mathfilters~=1.0
-Requires-Dist: django-mptt~=0.14.0
+Requires-Dist: django-mptt==0.14.0
 Requires-Dist: django-rest-swagger~=2.2
 Requires-Dist: django-settings-export~=1.2
 Requires-Dist: django-split-settings~=1.2
@@ -47,7 +47,9 @@ Requires-Dist: djangorestframework~=3.14
 Requires-Dist: drf-extensions~=0.7.1
 Requires-Dist: iso8601~=2.0
 Requires-Dist: markdown~=3.4
+Requires-Dist: packaging~=23.2
 Requires-Dist: pypandoc~=1.11
+Requires-Dist: requests-toolbelt~=1.0
 Requires-Dist: rules~=3.3
 Provides-Extra: allauth
 Requires-Dist: django-allauth~=0.57.0; extra == "allauth"
@@ -55,7 +57,12 @@ Provides-Extra: ci
 Requires-Dist: coveralls~=3.3; extra == "ci"
 Requires-Dist: rdmo[dev]; extra == "ci"
 Provides-Extra: dev
+Requires-Dist: build~=1.0; extra == "dev"
+Requires-Dist: pipdeptree~=2.13; extra == "dev"
 Requires-Dist: pre-commit~=3.4; extra == "dev"
+Requires-Dist: setuptools~=69.0; extra == "dev"
+Requires-Dist: twine~=4.0; extra == "dev"
+Requires-Dist: wheel~=0.42.0; extra == "dev"
 Requires-Dist: rdmo[allauth]; extra == "dev"
 Requires-Dist: rdmo[pytest]; extra == "dev"
 Provides-Extra: gunicorn
@@ -71,6 +78,7 @@ Requires-Dist: pytest~=7.4; extra == "pytest"
 Requires-Dist: pytest-cov~=4.1; extra == "pytest"
 Requires-Dist: pytest-django~=4.5; extra == "pytest"
 Requires-Dist: pytest-mock~=3.11; extra == "pytest"
+Requires-Dist: pytest-playwright~=0.4.3; extra == "pytest"
 Requires-Dist: pytest-randomly~=3.15; extra == "pytest"
 Requires-Dist: pytest-xdist~=3.3; extra == "pytest"
 
@@ -80,11 +88,11 @@ RDMO - Research Data Management Organiser
 [![Latest release](https://img.shields.io/pypi/v/rdmo.svg?style=flat)](https://pypi.python.org/pypi/rdmo/)
 [![Python Versions](https://img.shields.io/pypi/pyversions/rdmo.svg?style=flat)](https://www.python.org/)
 [![Django Versions](https://img.shields.io/pypi/frameworkversions/django/rdmo)](https://pypi.python.org/pypi/rdmo/)
-[![License](https://img.shields.io/github/license/rdmorganiser/rdmo?style=flat)](https://github.com/rdmorganiser/rdmo/blob/master/LICENSE) \
+[![License](https://img.shields.io/github/license/rdmorganiser/rdmo?style=flat)](https://github.com/rdmorganiser/rdmo/blob/main/LICENSE) \
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![CI Workflow Status](https://github.com/rdmorganiser/rdmo/actions/workflows/ci.yml/badge.svg)](https://github.com/rdmorganiser/rdmo/actions/workflows/ci.yml)
-[![Coverage Status](https://coveralls.io/repos/rdmorganiser/rdmo/badge.svg?branch=master&service=github)](https://coveralls.io/github/rdmorganiser/rdmo?branch=master)
+[![Coverage Status](https://coveralls.io/repos/rdmorganiser/rdmo/badge.svg?branch=main&service=github)](https://coveralls.io/github/rdmorganiser/rdmo?branch=main)
 [![Documentation status](https://readthedocs.org/projects/rdmo/badge/?version=latest)](http://rdmo.readthedocs.io/en/latest/?badge=latest)
 
 RDMO is a tool to support the systematic planning, organisation and implementation of the data management throughout the course of a research project. RDMO is funded by the Deutsche Forschungsgemeinschaft (DFG).

{rdmo-2.0.2 → rdmo-2.1.1}/README.md

@@ -4,11 +4,11 @@ RDMO - Research Data Management Organiser
 [![Latest release](https://img.shields.io/pypi/v/rdmo.svg?style=flat)](https://pypi.python.org/pypi/rdmo/)
 [![Python Versions](https://img.shields.io/pypi/pyversions/rdmo.svg?style=flat)](https://www.python.org/)
 [![Django Versions](https://img.shields.io/pypi/frameworkversions/django/rdmo)](https://pypi.python.org/pypi/rdmo/)
-[![License](https://img.shields.io/github/license/rdmorganiser/rdmo?style=flat)](https://github.com/rdmorganiser/rdmo/blob/master/LICENSE) \
+[![License](https://img.shields.io/github/license/rdmorganiser/rdmo?style=flat)](https://github.com/rdmorganiser/rdmo/blob/main/LICENSE) \
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![CI Workflow Status](https://github.com/rdmorganiser/rdmo/actions/workflows/ci.yml/badge.svg)](https://github.com/rdmorganiser/rdmo/actions/workflows/ci.yml)
-[![Coverage Status](https://coveralls.io/repos/rdmorganiser/rdmo/badge.svg?branch=master&service=github)](https://coveralls.io/github/rdmorganiser/rdmo?branch=master)
+[![Coverage Status](https://coveralls.io/repos/rdmorganiser/rdmo/badge.svg?branch=main&service=github)](https://coveralls.io/github/rdmorganiser/rdmo?branch=main)
 [![Documentation status](https://readthedocs.org/projects/rdmo/badge/?version=latest)](http://rdmo.readthedocs.io/en/latest/?badge=latest)
 
 RDMO is a tool to support the systematic planning, organisation and implementation of the data management throughout the course of a research project. RDMO is funded by the Deutsche Forschungsgemeinschaft (DFG).

{rdmo-2.0.2 → rdmo-2.1.1}/pyproject.toml

@@ -37,6 +37,9 @@ dynamic = [
   "version",
 ]
 dependencies = [
+  # dependencies with major version on zero are declared with
+  # major.minor.patch, because they can potentially introduce breaking changes
+  # in minor version updates anytime
   "defusedcsv~=2.0",
   "defusedxml~=0.7.1",
   "django~=4.2",
@@ -46,7 +49,7 @@ dependencies = [
   "django-filter~=23.2",
   "django-libsass~=0.9",
   "django-mathfilters~=1.0",
-  "django-mptt~=0.14.0",
+  "django-mptt==0.14.0", # pinned, 0.15 requires Python >= 3.9
   "django-rest-swagger~=2.2",
   "django-settings-export~=1.2",
   "django-split-settings~=1.2",
@@ -55,7 +58,9 @@ dependencies = [
   "drf-extensions~=0.7.1",
   "iso8601~=2.0",
   "markdown~=3.4",
+  "packaging~=23.2",
   "pypandoc~=1.11",
+  "requests-toolbelt~=1.0",
   "rules~=3.3",
 ]
 
@@ -68,7 +73,12 @@ ci = [
   "rdmo[dev]",
 ]
 dev = [
+  "build~=1.0",
+  "pipdeptree~=2.13",
   "pre-commit~=3.4",
+  "setuptools~=69.0",
+  "twine~=4.0",
+  "wheel~=0.42.0",
   "rdmo[allauth]",
   "rdmo[pytest]",
 ]
@@ -89,12 +99,13 @@ pytest = [
   "pytest-cov~=4.1",
   "pytest-django~=4.5",
   "pytest-mock~=3.11",
+  "pytest-playwright~=0.4.3",
   "pytest-randomly~=3.15",
   "pytest-xdist~=3.3",
 ]
 
 [project.urls]
-changelog = "https://github.com/rdmorganiser/rdmo/blob/master/CHANGELOG.md"
+changelog = "https://github.com/rdmorganiser/rdmo/blob/main/CHANGELOG.md"
 documentation = "https://rdmo.readthedocs.io"
 homepage = "https://rdmorganiser.github.io"
 issues = "https://github.com/rdmorganiser/rdmo/issues"
@@ -117,6 +128,7 @@ line-length = 120
 select = [
   "B",    # flake8-bugbear
   "C4",   # flake8-comprehensions
+  "DJ",   # flake8-django
   "E",    # pycodestyle
   "F",    # pyflakes
   "I",    # isort
@@ -175,9 +187,12 @@ rest_framework = ["rest_framework"]
 [tool.pytest.ini_options]
 DJANGO_SETTINGS_MODULE = "config.settings"
 testpaths = ["rdmo"]
-python_files = "test_*[!.txt].py"
+python_files = "test_*.py"
 pythonpath = [".", "testing"]
-addopts = "-p no:randomly"
+addopts = '-p no:randomly -m "not e2e"'
+markers = [
+  "e2e: marks tests as end-to-end tests using playwright (deselect with '-m \"not e2e\"')",
+]
 filterwarnings = [
   # fail on RemovedInDjango50Warning exception
   "error::django.utils.deprecation.RemovedInDjango50Warning",

rdmo-2.1.1/rdmo/__init__.py

@@ -0,0 +1 @@
+__version__ = "2.1.1"

rdmo-2.1.1/rdmo/accounts/adapter.py

@@ -0,0 +1,35 @@
+from django.conf import settings
+from django.contrib.auth.models import Group
+
+from allauth.account.adapter import DefaultAccountAdapter
+from allauth.socialaccount.adapter import DefaultSocialAccountAdapter
+
+
+class AccountAdapter(DefaultAccountAdapter):
+
+    def is_open_for_signup(self, request):
+        return settings.ACCOUNT_SIGNUP
+
+    def save_user(self, request, user, form, commit=True):
+        user = super().save_user(request, user, form, commit)
+
+        if settings.ACCOUNT_GROUPS:
+            groups = Group.objects.filter(name__in=settings.ACCOUNT_GROUPS)
+            user.groups.set(groups)
+
+        return user
+
+class SocialAccountAdapter(DefaultSocialAccountAdapter):
+
+    def is_open_for_signup(self, request, sociallogin):
+        return settings.SOCIALACCOUNT_SIGNUP
+
+    def save_user(self, request, sociallogin, form=None):
+        user = super().save_user(request, sociallogin, form)
+
+        if settings.SOCIALACCOUNT_GROUPS:
+            provider = str(sociallogin.account.provider)
+            groups = Group.objects.filter(name__in=settings.SOCIALACCOUNT_GROUPS.get(provider, []))
+            user.groups.set(groups)
+
+        return user

{rdmo-2.0.2 → rdmo-2.1.1}/rdmo/accounts/admin.py

@@ -5,14 +5,17 @@ from django.db.models import Count, Value
 from .models import AdditionalField, AdditionalFieldValue, ConsentFieldValue, Role
 
 
+@admin.register(AdditionalField)
 class AdditionalFieldAdmin(admin.ModelAdmin):
     pass
 
 
+@admin.register(AdditionalFieldValue)
 class AdditionalFieldValueAdmin(admin.ModelAdmin):
     readonly_fields = ('user', )
 
 
+@admin.register(ConsentFieldValue)
 class ConsentFieldValueAdmin(admin.ModelAdmin):
     readonly_fields = ('user', 'consent')
 
@@ -20,11 +23,12 @@ class ConsentFieldValueAdmin(admin.ModelAdmin):
         return False
 
 
+@admin.register(Role)
 class RoleAdmin(admin.ModelAdmin):
     search_fields = ('user__username', 'user__email')
     list_filter = ('member', 'manager', 'editor', 'reviewer')
 
-    list_display = ('user', 'members', 'managers', 'editors', 'reviewers')
+    list_display = ('user', 'email', 'members', 'managers', 'editors', 'reviewers')
 
     def get_queryset(self, request):
         return Role.objects.prefetch_related(
@@ -39,6 +43,9 @@ class RoleAdmin(admin.ModelAdmin):
             return 'all Sites'
         return ', '.join([site.domain for site in getattr(obj, field_name).all()])
 
+    def email(self, obj):
+        return obj.user.email
+
     def members(self, obj):
         return self.render_all_sites_or_join(obj, 'member')
 
@@ -50,9 +57,3 @@ class RoleAdmin(admin.ModelAdmin):
 
     def reviewers(self, obj):
         return self.render_all_sites_or_join(obj, 'reviewer')
-
-
-admin.site.register(AdditionalField, AdditionalFieldAdmin)
-admin.site.register(AdditionalFieldValue, AdditionalFieldValueAdmin)
-admin.site.register(ConsentFieldValue, ConsentFieldValueAdmin)
-admin.site.register(Role, RoleAdmin)

rdmo-2.1.1/rdmo/accounts/migrations/0021_alter_help_text.py

@@ -0,0 +1,63 @@
+# Generated by Django 4.2.6 on 2023-12-04 11:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0020_add_role_editor_and_reviewer'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='additionalfield',
+            name='help_lang1',
+            field=models.TextField(blank=True, help_text='The help text to be displayed next to the input element (in the primary language).', verbose_name='Help (primary)'),
+        ),
+        migrations.AlterField(
+            model_name='additionalfield',
+            name='help_lang2',
+            field=models.TextField(blank=True, help_text='The help text to be displayed next to the input element (in the secondary language).', verbose_name='Help (secondary)'),
+        ),
+        migrations.AlterField(
+            model_name='additionalfield',
+            name='help_lang3',
+            field=models.TextField(blank=True, help_text='The help text to be displayed next to the input element (in the tertiary language).', verbose_name='Help (tertiary)'),
+        ),
+        migrations.AlterField(
+            model_name='additionalfield',
+            name='help_lang4',
+            field=models.TextField(blank=True, help_text='The help text to be displayed next to the input element (in the quaternary language).', verbose_name='Help (quaternary)'),
+        ),
+        migrations.AlterField(
+            model_name='additionalfield',
+            name='help_lang5',
+            field=models.TextField(blank=True, help_text='The help text to be displayed next to the input element (in the quinary language).', verbose_name='Help (quinary)'),
+        ),
+        migrations.AlterField(
+            model_name='additionalfield',
+            name='text_lang1',
+            field=models.CharField(blank=True, help_text='The text for this additional field (in the primary language).', max_length=256, verbose_name='Text (primary)'),
+        ),
+        migrations.AlterField(
+            model_name='additionalfield',
+            name='text_lang2',
+            field=models.CharField(blank=True, help_text='The text for this additional field (in the secondary language).', max_length=256, verbose_name='Text (secondary)'),
+        ),
+        migrations.AlterField(
+            model_name='additionalfield',
+            name='text_lang3',
+            field=models.CharField(blank=True, help_text='The text for this additional field (in the tertiary language).', max_length=256, verbose_name='Text (tertiary)'),
+        ),
+        migrations.AlterField(
+            model_name='additionalfield',
+            name='text_lang4',
+            field=models.CharField(blank=True, help_text='The text for this additional field (in the quaternary language).', max_length=256, verbose_name='Text (quaternary)'),
+        ),
+        migrations.AlterField(
+            model_name='additionalfield',
+            name='text_lang5',
+            field=models.CharField(blank=True, help_text='The text for this additional field (in the quinary language).', max_length=256, verbose_name='Text (quinary)'),
+        ),
+    ]

{rdmo-2.0.2 → rdmo-2.1.1}/rdmo/accounts/models.py

@@ -21,52 +21,52 @@ class AdditionalField(models.Model, TranslationMixin):
     text_lang1 = models.CharField(
         max_length=256, blank=True,
         verbose_name=_('Text (primary)'),
-        help_text=_('The text for this additional field in the primary language.')
+        help_text=_('The text for this additional field (in the primary language).')
     )
     text_lang2 = models.CharField(
         max_length=256, blank=True,
         verbose_name=_('Text (secondary)'),
-        help_text=_('The text for this additional field in the secondary language.')
+        help_text=_('The text for this additional field (in the secondary language).')
     )
     text_lang3 = models.CharField(
         max_length=256, blank=True,
         verbose_name=_('Text (tertiary)'),
-        help_text=_('The text for this additional field in the tertiary language.')
+        help_text=_('The text for this additional field (in the tertiary language).')
     )
     text_lang4 = models.CharField(
         max_length=256, blank=True,
         verbose_name=_('Text (quaternary)'),
-        help_text=_('The text for this additional field in the quaternary language.')
+        help_text=_('The text for this additional field (in the quaternary language).')
     )
     text_lang5 = models.CharField(
         max_length=256, blank=True,
         verbose_name=_('Text (quinary)'),
-        help_text=_('The text for this additional field in the quinary language.')
+        help_text=_('The text for this additional field (in the quinary language).')
     )
     help_lang1 = models.TextField(
         blank=True,
         verbose_name=_('Help (primary)'),
-        help_text=_('The help text to be displayed next to the input element in the primary language.')
+        help_text=_('The help text to be displayed next to the input element (in the primary language).')
     )
     help_lang2 = models.TextField(
         blank=True,
         verbose_name=_('Help (secondary)'),
-        help_text=_('The help text to be displayed next to the input element in the secondary language.')
+        help_text=_('The help text to be displayed next to the input element (in the secondary language).')
     )
     help_lang3 = models.TextField(
         blank=True,
         verbose_name=_('Help (tertiary)'),
-        help_text=_('The help text to be displayed next to the input element in the tertiary language.')
+        help_text=_('The help text to be displayed next to the input element (in the tertiary language).')
     )
     help_lang4 = models.TextField(
         blank=True,
         verbose_name=_('Help (quaternary)'),
-        help_text=_('The help text to be displayed next to the input element in the quaternary language.')
+        help_text=_('The help text to be displayed next to the input element (in the quaternary language).')
     )
     help_lang5 = models.TextField(
         blank=True,
         verbose_name=_('Help (quinary)'),
-        help_text=_('The help text to be displayed next to the input element in the quinary language.')
+        help_text=_('The help text to be displayed next to the input element (in the quinary language).')
     )
     required = models.BooleanField(
         verbose_name=_('Required'),

rdmo-2.1.1/rdmo/accounts/templates/socialaccount/login.html

@@ -0,0 +1,21 @@
+{% extends 'core/page.html' %}
+{% load i18n %}
+
+{% block head_title %}{% trans "Sign In" %}{% endblock %}
+
+{% block page %}
+{% if process == "connect" %}
+<h1>{% blocktrans with provider.name as provider %}Connect {{ provider }}{% endblocktrans %}</h1>
+
+<p>{% blocktrans with provider.name as provider %}You are about to connect a new third party account from {{ provider }}.{% endblocktrans %}</p>
+{% else %}
+<h1>{% blocktrans with provider.name as provider %}Sign In Via {{ provider }}{% endblocktrans %}</h1>
+
+<p>{% blocktrans with provider.name as provider %}You are about to sign in using a third party account from {{ provider }}.{% endblocktrans %}</p>
+{% endif %}
+
+<form method="post">
+  {% csrf_token %}
+  <button class="btn btn-primary" type="submit">{% trans "Continue" %}</button>
+</form>
+{% endblock %}

{rdmo-2.0.2 → rdmo-2.1.1}/rdmo/accounts/templates/socialaccount/snippets/provider_list.html

@@ -24,13 +24,23 @@
         <img src="{% static 'accounts/img/orcid-signin.png' %}" alt="ORCID sign in" />
     </a>
 </li>
-{% elif provider.id == 'keycloak' %}
-<li class="socialaccount_provider_break">
-    <a title="{{ provider.name }}" class="socialaccount_provider {{ provider.id }}"
-        href="{% provider_login_url provider.id process=process scope=scope auth_params=auth_params %}">
-        <img src="{% static 'accounts/img/keycloak_logo_200px.svg' %}" alt="Keycloak sign in" />
-    </a>
-</li>
+{% elif provider.id == 'openid_connect' %}
+    {% if provider.app.provider_id == 'keycloak' %}
+    <li class="socialaccount_provider_break">
+        <a title="{{ provider.name }}" class="socialaccount_provider {{ provider.id }}"
+            href="{% provider_login_url provider process=process scope=scope auth_params=auth_params %}">
+            <img src="{% static 'accounts/img/keycloak_logo_200px.svg' %}" alt="Keycloak sign in" />
+        </a>
+    </li>
+    {% else %}
+    <li>
+        <a title="{{provider.name}}" class="socialaccount_provider {{provider.id}}"
+            href="{% provider_login_url provider process=process scope=scope auth_params=auth_params %}">
+            {{ provider.name }}
+        </a>
+    </li>
+{% endif %}
+
 {% else %}
 <li>
     <a title="{{provider.name}}" class="socialaccount_provider {{provider.id}}"

{rdmo-2.0.2 → rdmo-2.1.1}/rdmo/conditions/admin.py

@@ -10,13 +10,25 @@ class ConditionAdminForm(forms.ModelForm):
 
     class Meta:
         model = Condition
-        fields = '__all__'
+        fields = [
+            "uri",
+            "uri_prefix",
+            "uri_path",
+            "comment",
+            "locked",
+            "editors",
+            "source",
+            "relation",
+            "target_text",
+            "target_option",
+        ]
 
     def clean(self):
         ConditionUniqueURIValidator(self.instance)(self.cleaned_data)
         ConditionLockedValidator(self.instance)(self.cleaned_data)
 
 
+@admin.register(Condition)
 class ConditionAdmin(admin.ModelAdmin):
     form = ConditionAdminForm
 
@@ -25,6 +37,3 @@ class ConditionAdmin(admin.ModelAdmin):
     readonly_fields = ('uri', )
     list_filter = ('relation', )
     filter_horizontal = ('editors', )
-
-
-admin.site.register(Condition, ConditionAdmin)

{rdmo-2.0.2 → rdmo-2.1.1}/rdmo/conditions/viewsets.py

@@ -1,5 +1,4 @@
 from rest_framework.decorators import action
-from rest_framework.filters import SearchFilter
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.viewsets import ModelViewSet
@@ -7,6 +6,7 @@ from rest_framework.viewsets import ModelViewSet
 from django_filters.rest_framework import DjangoFilterBackend
 
 from rdmo.core.exports import XMLResponse
+from rdmo.core.filters import SearchFilter
 from rdmo.core.permissions import HasModelPermission, HasObjectPermission
 from rdmo.core.utils import is_truthy, render_to_format
 from rdmo.core.views import ChoicesViewSet

{rdmo-2.0.2 → rdmo-2.1.1}/rdmo/core/constants.py

@@ -58,3 +58,22 @@ PERMISSIONS = {
         'views.add_view', 'views.change_view', 'views.delete_view'
     )
 }
+
+HUMAN2BYTES_MAPPER = {
+    "b": {"base": 1000, "power": 0},
+    "kb": {"base": 1000, "power": 1},
+    "k": {"base": 1000, "power": 1},
+    "mb": {"base": 1000, "power": 2},
+    "m": {"base": 1000, "power": 2},
+    "gb": {"base": 1000, "power": 3},
+    "g": {"base": 1000, "power": 3},
+    "tb": {"base": 1000, "power": 4},
+    "t": {"base": 1000, "power": 4},
+    "p": {"base": 1000, "power": 5},
+    "pb": {"base": 1000, "power": 5},
+    "kib": {"base": 1024, "power": 1},
+    "mib": {"base": 1024, "power": 2},
+    "gib": {"base": 1024, "power": 3},
+    "tib": {"base": 1024, "power": 4},
+    "pib": {"base": 1024, "power": 5},
+}

rdmo-2.1.1/rdmo/core/filters.py

@@ -0,0 +1,30 @@
+from django.db.models import Q
+from django.utils.translation import get_language
+
+from rest_framework.filters import BaseFilterBackend
+
+from rdmo.core.utils import get_languages
+
+
+class SearchFilter(BaseFilterBackend):
+
+    def filter_queryset(self, request, queryset, view):
+        if view.detail:
+            return queryset
+
+        search = request.GET.get('search')
+        if search:
+            q = Q()
+
+            if 'uri' in view.search_fields:
+                q |= Q(uri__contains=search)
+
+            for lang_code, lang_string, lang_field in get_languages():
+                if lang_code == get_language():
+                    for search_field in ['title', 'text']:
+                        if search_field in view.search_fields:
+                            q |= Q(**{f'{search_field}_{lang_field}__contains': search})
+
+            queryset = queryset.filter(q)
+
+        return queryset

{rdmo-2.0.2 → rdmo-2.1.1}/rdmo/core/settings.py

@@ -98,15 +98,9 @@ PROFILE_DELETE = True
 
 ACCOUNT = False
 ACCOUNT_SIGNUP = False
+ACCOUNT_GROUPS = []
 ACCOUNT_TERMS_OF_USE = False
-
-SOCIALACCOUNT = False
-
-SHIBBOLETH = False
-SHIBBOLETH_LOGIN_URL = '/Shibboleth.sso/Login'
-SHIBBOLETH_LOGOUT_URL = '/Shibboleth.sso/Logout'
-SHIBBOLETH_USERNAME_PATTERN = None
-
+ACCOUNT_ADAPTER = 'rdmo.accounts.adapter.AccountAdapter'
 ACCOUNT_SIGNUP_FORM_CLASS = 'rdmo.accounts.forms.SignupForm'
 ACCOUNT_USER_DISPLAY = 'rdmo.accounts.utils.get_full_name'
 ACCOUNT_EMAIL_REQUIRED = True
@@ -120,11 +114,16 @@ ACCOUNT_EMAIL_MAX_LENGTH = 190
 ACCOUNT_PREVENT_ENUMERATION = False
 ACCOUNT_ALLOW_USER_TOKEN = False
 
-ACCOUNT_ADAPTER = 'rdmo.accounts.adapter.AccountAdapter'
-
-SOCIALACCOUNT_ADAPTER = 'rdmo.accounts.adapter.SocialAccountAdapter'
+SOCIALACCOUNT = False
 SOCIALACCOUNT_SIGNUP = False
+SOCIALACCOUNT_GROUPS = []
 SOCIALACCOUNT_AUTO_SIGNUP = False
+SOCIALACCOUNT_ADAPTER = 'rdmo.accounts.adapter.SocialAccountAdapter'
+
+SHIBBOLETH = False
+SHIBBOLETH_LOGIN_URL = '/Shibboleth.sso/Login'
+SHIBBOLETH_LOGOUT_URL = '/Shibboleth.sso/Logout'
+SHIBBOLETH_USERNAME_PATTERN = None
 
 LANGUAGE_CODE = 'en-us'
 
@@ -306,6 +305,11 @@ PROJECT_SEND_INVITE = True
 
 PROJECT_REMOVE_VIEWS = True
 
+PROJECT_CREATE_RESTRICTED = False
+PROJECT_CREATE_GROUPS = []
+
+PROJECT_VALUES_CONFLICT_THRESHOLD = 0.01
+
 NESTED_PROJECTS = True
 
 OPTIONSET_PROVIDERS = []
@@ -318,6 +322,7 @@ QUESTIONS_WIDGETS = [
     ('radio', _('Radio buttons'), 'rdmo.projects.widgets.RadioWidget'),
     ('select', _('Select drop-down'), 'rdmo.projects.widgets.SelectWidget'),
     ('autocomplete', _('Autocomplete'), 'rdmo.projects.widgets.AutocompleteWidget'),
+    ('freeautocomplete', _('Free autocomplete'), 'rdmo.projects.widgets.FreeAutocompleteWidget'),
     ('range', _('Range slider'), 'rdmo.projects.widgets.RangeWidget'),
     ('date', _('Date picker'), 'rdmo.projects.widgets.DateWidget'),
     ('file', _('File upload'), 'rdmo.projects.widgets.FileWidget')

{rdmo-2.0.2 → rdmo-2.1.1}/rdmo/core/static/core/css/base.scss

@@ -75,6 +75,10 @@ a {
             color: #a94442;
         }
     }
+
+    &.disabled {
+        cursor: not-allowed;
+    }
 }
 
 code {
@@ -129,9 +133,14 @@ table {
     }
 }
 
+details {
+    margin-bottom: 10px;
+}
+
 summary {
-    color: $link-color;
+    display: list-item;
     cursor: pointer;
+    margin-bottom: 5px;
 }
 
 metadata {
@@ -183,7 +192,8 @@ metadata {
 .page h2:nth-child(2) {
     margin-top: 0;
 }
-.sidebar h2:first-child {
+.sidebar h2:first-child,
+.sidebar .import-buttons {
     margin-top: 70px;
 }
 
@@ -477,3 +487,13 @@ li.has-warning > a.control-label > i {
     text-decoration: underline;
     text-decoration-style: dotted;
 }
+
+.more,
+.show-less {
+    display: none;
+}
+.show-more,
+.show-less {
+    color: $link-color;
+    cursor: pointer;
+}