rdmo 2.2.0__tar.gz → 2.2.1__tar.gz

{rdmo-2.2.0/rdmo.egg-info → rdmo-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rdmo
-Version: 2.2.0
+Version: 2.2.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
@@ -45,6 +45,7 @@ Requires-Dist: django-split-settings<2.0,>=1.2
 Requires-Dist: django-widget-tweaks<2.0,>=1.5
 Requires-Dist: djangorestframework<4.0,>=3.15
 Requires-Dist: drf-extensions<1.0,>=0.7.1
+Requires-Dist: importlib_metadata<8.5.0
 Requires-Dist: iso8601<3.0,>=2.0
 Requires-Dist: markdown<4.0,>=3.4
 Requires-Dist: packaging<25.0,>=23.2

{rdmo-2.2.0 → rdmo-2.2.1}/pyproject.toml

@@ -56,6 +56,7 @@ dependencies = [
   "django-widget-tweaks>=1.5,<2.0",
   "djangorestframework>=3.15,<4.0",
   "drf-extensions>=0.7.1,<1.0",
+  "importlib_metadata<8.5.0",  # upstrem problem, see https://github.com/python/importlib_metadata/issues/506
   "iso8601>=2.0,<3.0",
   "markdown>=3.4,<4.0",
   "packaging>=23.2,<25.0",

rdmo-2.2.1/rdmo/__init__.py

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

rdmo-2.2.1/rdmo/accounts/adapter.py

@@ -0,0 +1,72 @@
+from django.conf import settings
+from django.contrib.auth.models import Group
+from django.forms import BooleanField
+
+from allauth.account.adapter import DefaultAccountAdapter
+from allauth.account.forms import LoginForm as AllauthLoginForm
+from allauth.account.forms import SignupForm as AllauthSignupForm
+from allauth.socialaccount.adapter import DefaultSocialAccountAdapter
+
+from .forms import ProfileForm
+from .models import ConsentFieldValue
+
+
+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
+
+
+class LoginForm(AllauthLoginForm):
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # remove forget password link introduced with allauth 0.57.0
+        password_field = self.fields.get('password')
+        if password_field:
+            password_field.help_text = None
+
+
+class SignupForm(AllauthSignupForm, ProfileForm):
+
+    use_required_attribute = False
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # add a consent field, the label is added in the template
+        if settings.ACCOUNT_TERMS_OF_USE:
+            self.fields['consent'] = BooleanField(required=True)
+
+    def signup(self, request, user):
+        self._save_additional_values(user)
+
+        # store the consent field
+        if settings.ACCOUNT_TERMS_OF_USE:
+            consent = ConsentFieldValue(user=user, consent=self.cleaned_data['consent'])
+            consent.save()

{rdmo-2.2.0 → rdmo-2.2.1}/rdmo/accounts/forms.py

@@ -5,10 +5,7 @@ from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.utils.translation import gettext_lazy as _
 
-from allauth.account.forms import LoginForm as AllauthLoginForm
-from allauth.account.forms import SignupForm as AllauthSignupForm
-
-from .models import AdditionalField, AdditionalFieldValue, ConsentFieldValue
+from .models import AdditionalField, AdditionalFieldValue
 
 log = logging.getLogger(__name__)
 
@@ -71,37 +68,6 @@ class ProfileForm(forms.ModelForm):
             additional_value.save()
 
 
-class LoginForm(AllauthLoginForm):
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        # remove forget password link introduced with allauth 0.57.0
-        password_field = self.fields.get('password')
-        if password_field:
-            password_field.help_text = None
-
-
-class SignupForm(AllauthSignupForm, ProfileForm):
-
-    use_required_attribute = False
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        # add a consent field, the label is added in the template
-        if settings.ACCOUNT_TERMS_OF_USE:
-            self.fields['consent'] = forms.BooleanField(required=True)
-
-    def signup(self, request, user):
-        self._save_additional_values(user)
-
-        # store the consent field
-        if settings.ACCOUNT_TERMS_OF_USE:
-            consent = ConsentFieldValue(user=user, consent=self.cleaned_data['consent'])
-            consent.save()
-
-
 class RemoveForm(forms.Form):
 
     def __init__(self, *args, **kwargs):

{rdmo-2.2.0 → rdmo-2.2.1}/rdmo/core/settings.py

@@ -102,9 +102,8 @@ ACCOUNT_GROUPS = []
 ACCOUNT_TERMS_OF_USE = False
 ACCOUNT_ADAPTER = 'rdmo.accounts.adapter.AccountAdapter'
 ACCOUNT_FORMS = {
-    'login': 'rdmo.accounts.forms.LoginForm',
-    'signup': 'rdmo.accounts.forms.SignupForm'
-
+    'login': 'rdmo.accounts.adapter.LoginForm',
+    'signup': 'rdmo.accounts.adapter.SignupForm'
 }
 ACCOUNT_USER_DISPLAY = 'rdmo.accounts.utils.get_full_name'
 ACCOUNT_EMAIL_REQUIRED = True

{rdmo-2.2.0 → rdmo-2.2.1}/rdmo/core/views.py

@@ -32,7 +32,7 @@ def home(request):
     else:
         if settings.LOGIN_FORM:
             if settings.ACCOUNT or settings.SOCIALACCOUNT:
-                from rdmo.accounts.forms import LoginForm
+                from rdmo.accounts.adapter import LoginForm
                 return render(request, 'core/home.html', {
                     'form': LoginForm(),
                     'signup_url': reverse("account_signup")

{rdmo-2.2.0 → rdmo-2.2.1}/rdmo/locale/de/LC_MESSAGES/djangojs.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: RDMO\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-23 11:20+0200\n"
+"POT-Creation-Date: 2024-09-13 12:34+0000\n"
 "PO-Revision-Date: 2024-07-23 11:18+0200\n"
 "Last-Translator: Jochen Klar <jklar@aip.de>\n"
 "Language-Team: RDMO <rdmo-team@listserv.dfn.de>\n"
@@ -136,8 +136,8 @@ msgstr "Neues Attribut erstellen"
 #: management/assets/js/components/edit/EditAttribute.js:53
 #, javascript-format
 msgid ""
-"This attribute will be added to the attribute <code class=\"code-domain\">"
-"%s</code>."
+"This attribute will be added to the attribute <code class=\"code-"
+"domain\">%s</code>."
 msgstr ""
 "Dieses Attribut wird dem Attribut <code class=\"code-domain\">%s</code> "
 "hinzugefügt."
@@ -154,8 +154,8 @@ msgstr ""
 #: management/assets/js/components/edit/EditAttribute.js:68
 #, javascript-format
 msgid ""
-"This attribute will be added to the question set <code class=\"code-questions"
-"\">%s</code>."
+"This attribute will be added to the question set <code class=\"code-"
+"questions\">%s</code>."
 msgstr ""
 "Dieses Attribut wird dem Fragenset <code class=\"code-questions\">%s</code> "
 "hinzugefügt."
@@ -163,8 +163,8 @@ msgstr ""
 #: management/assets/js/components/edit/EditAttribute.js:75
 #, javascript-format
 msgid ""
-"This attribute will be added to the question <code class=\"code-questions\">"
-"%s</code>."
+"This attribute will be added to the question <code class=\"code-"
+"questions\">%s</code>."
 msgstr ""
 "Dieses Attribut wird der Frage <code class=\"code-questions\">%s</code> "
 "hinzugefügt."
@@ -172,8 +172,8 @@ msgstr ""
 #: management/assets/js/components/edit/EditAttribute.js:82
 #, javascript-format
 msgid ""
-"This attribute will be added to the condition <code class=\"code-conditions"
-"\">%s</code>."
+"This attribute will be added to the condition <code class=\"code-"
+"conditions\">%s</code>."
 msgstr ""
 "Dieses Attribut wird der Bedingung <code class=\"code-conditions\">%s</code> "
 "hinzugefügt."
@@ -219,8 +219,8 @@ msgstr "Neue Bedingung erstellen"
 #: management/assets/js/components/edit/EditCondition.js:57
 #, javascript-format
 msgid ""
-"This condition will be added to the option set <code class=\"code-options\">"
-"%s</code>."
+"This condition will be added to the option set <code class=\"code-"
+"options\">%s</code>."
 msgstr ""
 "Diese Bedingung wird dem Optionenset <code class=\"code-options\">%s</code> "
 "hinzugefügt."
@@ -237,8 +237,8 @@ msgstr ""
 #: management/assets/js/components/edit/EditCondition.js:71
 #, javascript-format
 msgid ""
-"This condition will be added to the question set <code class=\"code-questions"
-"\">%s</code>."
+"This condition will be added to the question set <code class=\"code-"
+"questions\">%s</code>."
 msgstr ""
 "Diese Bedingung wird dem Fragenset <code class=\"code-questions\">%s</code> "
 "hinzugefügt."
@@ -246,8 +246,8 @@ msgstr ""
 #: management/assets/js/components/edit/EditCondition.js:78
 #, javascript-format
 msgid ""
-"This condition will be added to the question <code class=\"code-questions\">"
-"%s</code>."
+"This condition will be added to the question <code class=\"code-"
+"questions\">%s</code>."
 msgstr ""
 "Diese Bedingung wird der Frage <code class=\"code-questions\">%s</code> "
 "hinzugefügt."
@@ -307,8 +307,8 @@ msgstr "Neues Optionenset erstellen"
 #: management/assets/js/components/edit/EditOptionSet.js:61
 #, javascript-format
 msgid ""
-"This option set will be added to the question <code class=\"code-questions\">"
-"%s</code>."
+"This option set will be added to the question <code class=\"code-"
+"questions\">%s</code>."
 msgstr ""
 "Dieser Optionenset wird der Frage <code class=\"code-questions\">%s</code> "
 "hinzugefügt."
@@ -415,8 +415,8 @@ msgstr ""
 #: management/assets/js/components/edit/EditQuestion.js:74
 #, javascript-format
 msgid ""
-"This question will be added to the question set <code class=\"code-questions"
-"\">%s</code>."
+"This question will be added to the question set <code class=\"code-"
+"questions\">%s</code>."
 msgstr ""
 "Diese Frage wird dem Fragenset <code class=\"code-questions\">%s</code> "
 "hinzugefügt."
@@ -439,8 +439,8 @@ msgstr "Fragenset erstellen"
 #: management/assets/js/components/edit/EditQuestionSet.js:96
 #, javascript-format
 msgid ""
-"This question set will be added to the page <code class=\"code-questions\">"
-"%s</code>."
+"This question set will be added to the page <code class=\"code-"
+"questions\">%s</code>."
 msgstr ""
 "Dieser Fragenset wird der Seite <code class=\"code-questions\">%s</code> "
 "hinzugefügt."
@@ -1039,7 +1039,7 @@ msgid "Changed"
 msgstr "Geändert"
 
 #: management/assets/js/components/import/ImportSuccessElement.js:16
-#: projects/assets/js/utils/constants.js:10
+#: projects/assets/js/utils/constants.js:8
 msgid "Created"
 msgstr "Erstellt"
 
@@ -1444,90 +1444,76 @@ msgstr "Projekt direkt importieren"
 msgid "Import from file"
 msgstr "Importieren aus Datei"
 
-#: projects/assets/js/components/helper/Table.js:52
-msgid "Scroll to top"
-msgstr "Zum Seitenanfang"
-
-#: projects/assets/js/components/helper/Table.js:59
-#: projects/assets/js/utils/translations.js:10
-msgid "Load more"
-msgstr "Mehr laden"
-
-#: projects/assets/js/components/helper/Table.js:62
-#: projects/assets/js/utils/translations.js:9
-msgid "Load all"
-msgstr "Alles laden"
-
-#: projects/assets/js/components/main/Projects.js:23
+#: projects/assets/js/components/main/Projects.js:22
 #: projects/assets/js/utils/translations.js:13
 msgid "Pending invitations"
 msgstr "Ausstehende Einladungen"
 
-#: projects/assets/js/components/main/Projects.js:29
+#: projects/assets/js/components/main/Projects.js:28
 #: projects/assets/js/utils/translations.js:7
 msgid "Import project"
 msgstr "Projekt importieren"
 
-#: projects/assets/js/components/main/Projects.js:38
+#: projects/assets/js/components/main/Projects.js:33
 #, javascript-format
 msgid "%s of %s projects are displayed"
 msgstr "%s von %s Projekten werden angezeigt"
 
-#: projects/assets/js/components/main/Projects.js:41
+#: projects/assets/js/components/main/Projects.js:36
 #, javascript-format
 msgid "%s of %s"
 msgstr "%s von %s"
 
-#: projects/assets/js/components/main/Projects.js:55
+#: projects/assets/js/components/main/Projects.js:47
 #: projects/assets/js/utils/translations.js:18
 msgid "View all projects"
 msgstr "Alle Projekte ansehen"
 
-#: projects/assets/js/components/main/Projects.js:55
+#: projects/assets/js/components/main/Projects.js:47
 #: projects/assets/js/utils/translations.js:19
 msgid "View my projects"
 msgstr "Meine Projekte ansehen"
 
-#: projects/assets/js/components/main/Projects.js:56
+#: projects/assets/js/components/main/Projects.js:48
 #: projects/assets/js/utils/translations.js:11
 msgid "My projects"
 msgstr "Meine Projekte"
 
-#: projects/assets/js/components/main/Projects.js:56
+#: projects/assets/js/components/main/Projects.js:48
 #: projects/assets/js/utils/translations.js:3
 msgid "All projects"
 msgstr "Alle Projekte"
 
-#: projects/assets/js/utils/constants.js:6
+#: projects/assets/js/utils/constants.js:4
 msgid "Name"
 msgstr "Name"
 
-#: projects/assets/js/utils/constants.js:7
+#: projects/assets/js/utils/constants.js:5
 msgid "Role"
 msgstr "Rolle"
 
-#: projects/assets/js/utils/constants.js:8
-#: projects/assets/js/utils/constants.js:19
+#: projects/assets/js/utils/constants.js:6
+#: projects/assets/js/utils/constants.js:17
 msgid "Owner"
 msgstr "Besitzer"
 
-#: projects/assets/js/utils/constants.js:9
+#: projects/assets/js/utils/constants.js:7
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: projects/assets/js/utils/constants.js:11
+#: projects/assets/js/utils/constants.js:9
 msgid "Last changed"
 msgstr "Letzte Änderung"
 
-#: projects/assets/js/utils/constants.js:16
+#: projects/assets/js/utils/constants.js:14
 msgid "Author"
 msgstr "Autor"
 
-#: projects/assets/js/utils/constants.js:17
+#: projects/assets/js/utils/constants.js:15
 msgid "Guest"
 msgstr "Gast"
 
-#: projects/assets/js/utils/constants.js:18
+#: projects/assets/js/utils/constants.js:16
 msgid "Manager"
 msgstr "Manager"
 
@@ -1547,6 +1533,14 @@ msgstr "Filter"
 msgid "Hide filters"
 msgstr "Filter ausblenden"
 
+#: projects/assets/js/utils/translations.js:9
+msgid "Load all"
+msgstr "Alles laden"
+
+#: projects/assets/js/utils/translations.js:10
+msgid "Load more"
+msgstr "Mehr laden"
+
 #: projects/assets/js/utils/translations.js:12
 msgid "New project"
 msgstr "Neues Projekt"
@@ -1563,6 +1557,9 @@ msgstr "Projekte durchsuchen"
 msgid "Show filters"
 msgstr "Filter anzeigen"
 
+#~ msgid "Scroll to top"
+#~ msgstr "Zum Seitenanfang"
+
 #~ msgid "Change"
 #~ msgstr "Ändern"