From 955e89c3d916546dd5a2479a875e170ffeff8c1c Mon Sep 17 00:00:00 2001
From: David Wallace <david.wallace@tu-darmstadt.de>
Date: Fri, 11 Jul 2025 08:23:56 +0200
Subject: [PATCH 01/14] bump version to 2.3.3

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
---
 rdmo/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rdmo/__init__.py b/rdmo/__init__.py
index ef6497d05..ed5cc1722 100644
--- a/rdmo/__init__.py
+++ b/rdmo/__init__.py
@@ -1 +1 @@
-__version__ = "2.3.2"
+__version__ = "2.3.3"

From 1dea78cf7c319d914b5d8c4fae20500d5054f975 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Mon, 4 Aug 2025 14:14:17 +0200
Subject: [PATCH 02/14] Add adjust label hook for radio and checkbox (#1398)

---
 .../components/main/widget/CheckboxWidget.js    | 11 ++++++++---
 .../components/main/widget/RadioInput.js        | 11 +++++++++--
 .../assets/js/interview/hooks/useAdjustLabel.js | 17 +++++++++++++++++
 3 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 rdmo/projects/assets/js/interview/hooks/useAdjustLabel.js

diff --git a/rdmo/projects/assets/js/interview/components/main/widget/CheckboxWidget.js b/rdmo/projects/assets/js/interview/components/main/widget/CheckboxWidget.js
index 87e913a66..92950b1fb 100644
--- a/rdmo/projects/assets/js/interview/components/main/widget/CheckboxWidget.js
+++ b/rdmo/projects/assets/js/interview/components/main/widget/CheckboxWidget.js
@@ -1,10 +1,11 @@
-import React from 'react'
+import React, { useRef } from 'react'
 import PropTypes from 'prop-types'
 
-
 import { getQuestionTextId, getQuestionHelpId } from '../../../utils/question'
 import { gatherOptions } from '../../../utils/options'
 
+import useAdjustLabel from '../../../hooks/useAdjustLabel'
+
 import QuestionCopyValues from '../question/QuestionCopyValues'
 import QuestionEraseValues from '../question/QuestionEraseValues'
 import QuestionError from '../question/QuestionError'
@@ -16,6 +17,10 @@ import CheckboxInput from './CheckboxInput'
 const CheckboxWidget = ({ page, question, sets, values, siblings, currentSet, disabled,
                           createValue, updateValue, deleteValue, copyValue }) => {
 
+  const ref = useRef(null)
+
+  useAdjustLabel(ref)
+
   const handleCreateValue = (attrsList) => {
     attrsList.forEach(attrs => {
       createValue({
@@ -35,7 +40,7 @@ const CheckboxWidget = ({ page, question, sets, values, siblings, currentSet, di
   return (
     <div className="interview-widgets">
       <div className="interview-widget">
-        <div className="interview-input checkbox-input">
+        <div ref={ref} className="interview-input checkbox-input">
           <div className="buttons-wrapper">
             <fieldset className="checkbox-control"
                       aria-labelledby={getQuestionTextId(question)}
diff --git a/rdmo/projects/assets/js/interview/components/main/widget/RadioInput.js b/rdmo/projects/assets/js/interview/components/main/widget/RadioInput.js
index 84f4453be..f0211b9dc 100644
--- a/rdmo/projects/assets/js/interview/components/main/widget/RadioInput.js
+++ b/rdmo/projects/assets/js/interview/components/main/widget/RadioInput.js
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { useRef } from 'react'
 import PropTypes from 'prop-types'
 import classNames from 'classnames'
 import { useDebouncedCallback } from 'use-debounce'
@@ -7,12 +7,19 @@ import { isEmpty } from 'lodash'
 import { getQuestionTextId, getQuestionHelpId } from '../../../utils/question'
 import { isDefaultValue } from '../../../utils/value'
 
+import useAdjustLabel from '../../../hooks/useAdjustLabel'
+
 import AdditionalTextInput from './common/AdditionalTextInput'
 import AdditionalTextareaInput from './common/AdditionalTextareaInput'
 import OptionHelp from './common/OptionHelp'
 import OptionText from './common/OptionText'
 
 const RadioInput = ({ question, value, options, disabled, updateValue, buttons }) => {
+
+  const ref = useRef(null)
+
+  useAdjustLabel(ref)
+
   const handleChange = (option) => {
     if (option.has_provider) {
       updateValue(value, {
@@ -46,7 +53,7 @@ const RadioInput = ({ question, value, options, disabled, updateValue, buttons }
   })
 
   return (
-    <div className="interview-input radio-input">
+    <div ref={ref} className="interview-input radio-input">
       <div className="buttons-wrapper">
         {buttons}
         <fieldset className={classnames}
diff --git a/rdmo/projects/assets/js/interview/hooks/useAdjustLabel.js b/rdmo/projects/assets/js/interview/hooks/useAdjustLabel.js
new file mode 100644
index 000000000..ed9e97f91
--- /dev/null
+++ b/rdmo/projects/assets/js/interview/hooks/useAdjustLabel.js
@@ -0,0 +1,17 @@
+import { useEffect } from 'react'
+
+const useAdjustLabel = (ref) => {
+  useEffect(() => {
+    if (ref.current) {
+      // find the .buttons node and get it's width
+      const buttons = ref.current.querySelector('.buttons')
+      const buttonsWidth = buttons.offsetWidth
+
+      // find the first label for a radio or checkbox and adjust the right padding
+      const label = ref.current.querySelector('.radio:first-child label, .checkbox:first-child label')
+      label.style.paddingRight = `${label.style.paddingRight + buttonsWidth}px`
+    }
+  }, [])
+}
+
+export default useAdjustLabel

From 94e682006b918bfc4b8865f0a9a63284de2858a8 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Thu, 7 Aug 2025 11:41:44 +0200
Subject: [PATCH 03/14] Fix adjust label hook

---
 .../components/main/widget/CheckboxInput.js        | 10 ++++++++--
 .../components/main/widget/CheckboxWidget.js       | 10 ++--------
 .../assets/js/interview/hooks/useAdjustLabel.js    | 14 ++++++++++----
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/rdmo/projects/assets/js/interview/components/main/widget/CheckboxInput.js b/rdmo/projects/assets/js/interview/components/main/widget/CheckboxInput.js
index 87e4438de..7f8b77f80 100644
--- a/rdmo/projects/assets/js/interview/components/main/widget/CheckboxInput.js
+++ b/rdmo/projects/assets/js/interview/components/main/widget/CheckboxInput.js
@@ -1,9 +1,11 @@
-import React from 'react'
+import React, { useRef } from 'react'
 import PropTypes from 'prop-types'
 import classNames from 'classnames'
 import { useDebouncedCallback } from 'use-debounce'
 import { isEmpty, isNil } from 'lodash'
 
+import useAdjustLabel from '../../../hooks/useAdjustLabel'
+
 import AdditionalTextInput from './common/AdditionalTextInput'
 import AdditionalTextareaInput from './common/AdditionalTextareaInput'
 import OptionHelp from './common/OptionHelp'
@@ -11,6 +13,10 @@ import OptionText from './common/OptionText'
 
 const CheckboxInput = ({ question, value, option, optionIndex, disabled, onCreate, onUpdate, onDelete }) => {
 
+  const ref = useRef(null)
+
+  useAdjustLabel(ref)
+
   const checked = !isNil(value)
 
   const classnames = classNames('checkbox', {
@@ -64,7 +70,7 @@ const CheckboxInput = ({ question, value, option, optionIndex, disabled, onCreat
   }, 500)
 
   return (
-    <div className={classnames}>
+    <div ref={ref} className={classnames}>
       <label>
         <input
           type="checkbox"
diff --git a/rdmo/projects/assets/js/interview/components/main/widget/CheckboxWidget.js b/rdmo/projects/assets/js/interview/components/main/widget/CheckboxWidget.js
index 92950b1fb..79fb0ada0 100644
--- a/rdmo/projects/assets/js/interview/components/main/widget/CheckboxWidget.js
+++ b/rdmo/projects/assets/js/interview/components/main/widget/CheckboxWidget.js
@@ -1,11 +1,9 @@
-import React, { useRef } from 'react'
+import React from 'react'
 import PropTypes from 'prop-types'
 
 import { getQuestionTextId, getQuestionHelpId } from '../../../utils/question'
 import { gatherOptions } from '../../../utils/options'
 
-import useAdjustLabel from '../../../hooks/useAdjustLabel'
-
 import QuestionCopyValues from '../question/QuestionCopyValues'
 import QuestionEraseValues from '../question/QuestionEraseValues'
 import QuestionError from '../question/QuestionError'
@@ -17,10 +15,6 @@ import CheckboxInput from './CheckboxInput'
 const CheckboxWidget = ({ page, question, sets, values, siblings, currentSet, disabled,
                           createValue, updateValue, deleteValue, copyValue }) => {
 
-  const ref = useRef(null)
-
-  useAdjustLabel(ref)
-
   const handleCreateValue = (attrsList) => {
     attrsList.forEach(attrs => {
       createValue({
@@ -40,7 +34,7 @@ const CheckboxWidget = ({ page, question, sets, values, siblings, currentSet, di
   return (
     <div className="interview-widgets">
       <div className="interview-widget">
-        <div ref={ref} className="interview-input checkbox-input">
+        <div className="interview-input checkbox-input">
           <div className="buttons-wrapper">
             <fieldset className="checkbox-control"
                       aria-labelledby={getQuestionTextId(question)}
diff --git a/rdmo/projects/assets/js/interview/hooks/useAdjustLabel.js b/rdmo/projects/assets/js/interview/hooks/useAdjustLabel.js
index ed9e97f91..16a0ec7eb 100644
--- a/rdmo/projects/assets/js/interview/hooks/useAdjustLabel.js
+++ b/rdmo/projects/assets/js/interview/hooks/useAdjustLabel.js
@@ -4,14 +4,20 @@ const useAdjustLabel = (ref) => {
   useEffect(() => {
     if (ref.current) {
       // find the .buttons node and get it's width
-      const buttons = ref.current.querySelector('.buttons')
-      const buttonsWidth = buttons.offsetWidth
+      const buttonsWidth = ref.current.classList.contains('checkbox') ? (
+        // for the checkbox widget, the parent of the parent is the buttons-wrapper
+        ref.current.parentElement.parentElement.querySelector('.buttons').offsetWidth
+      ) : (
+        ref.current.querySelector('.buttons').offsetWidth
+      )
 
       // find the first label for a radio or checkbox and adjust the right padding
       const label = ref.current.querySelector('.radio:first-child label, .checkbox:first-child label')
-      label.style.paddingRight = `${label.style.paddingRight + buttonsWidth}px`
+      if (label) {
+        label.style.paddingRight = `${label.style.paddingRight + buttonsWidth}px`
+      }
     }
-  }, [])
+  }, [ref.current])
 }
 
 export default useAdjustLabel

From 46cf6ed17e234b05a939b7ec8af9dbe10a6d3a5c Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Thu, 7 Aug 2025 12:05:57 +0200
Subject: [PATCH 04/14] Cancel debouncing when changing radio/checkbox in
 interview (#1406)

---
 .../assets/js/interview/components/main/widget/CheckboxInput.js | 2 ++
 .../assets/js/interview/components/main/widget/RadioInput.js    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/rdmo/projects/assets/js/interview/components/main/widget/CheckboxInput.js b/rdmo/projects/assets/js/interview/components/main/widget/CheckboxInput.js
index 7f8b77f80..1cbeb7b42 100644
--- a/rdmo/projects/assets/js/interview/components/main/widget/CheckboxInput.js
+++ b/rdmo/projects/assets/js/interview/components/main/widget/CheckboxInput.js
@@ -40,6 +40,8 @@ const CheckboxInput = ({ question, value, option, optionIndex, disabled, onCreat
   }
 
   const handleChange = () => {
+    handleAdditionalValueChange.cancel()
+
     if (checked) {
       onDelete(value)
     } else {
diff --git a/rdmo/projects/assets/js/interview/components/main/widget/RadioInput.js b/rdmo/projects/assets/js/interview/components/main/widget/RadioInput.js
index f0211b9dc..a301b0690 100644
--- a/rdmo/projects/assets/js/interview/components/main/widget/RadioInput.js
+++ b/rdmo/projects/assets/js/interview/components/main/widget/RadioInput.js
@@ -21,6 +21,8 @@ const RadioInput = ({ question, value, options, disabled, updateValue, buttons }
   useAdjustLabel(ref)
 
   const handleChange = (option) => {
+    handleAdditionalValueChange.cancel()
+
     if (option.has_provider) {
       updateValue(value, {
         text: option.text,

From 9f51fc99c7f569e0f1f4f2bb01c2df6a26ecbfda Mon Sep 17 00:00:00 2001
From: David Wallace <david.wallace@tu-darmstadt.de>
Date: Thu, 7 Aug 2025 14:46:02 +0200
Subject: [PATCH 05/14] Use state for additional input and clear on uncheck

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
---
 .../components/main/widget/CheckboxInput.js   | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/rdmo/projects/assets/js/interview/components/main/widget/CheckboxInput.js b/rdmo/projects/assets/js/interview/components/main/widget/CheckboxInput.js
index 1cbeb7b42..94499ceca 100644
--- a/rdmo/projects/assets/js/interview/components/main/widget/CheckboxInput.js
+++ b/rdmo/projects/assets/js/interview/components/main/widget/CheckboxInput.js
@@ -1,4 +1,4 @@
-import React, { useRef } from 'react'
+import React, {useRef, useState} from 'react'
 import PropTypes from 'prop-types'
 import classNames from 'classnames'
 import { useDebouncedCallback } from 'use-debounce'
@@ -14,6 +14,7 @@ import OptionText from './common/OptionText'
 const CheckboxInput = ({ question, value, option, optionIndex, disabled, onCreate, onUpdate, onDelete }) => {
 
   const ref = useRef(null)
+  const [additionalInputValue, setAdditionalInputValue] = useState('')
 
   useAdjustLabel(ref)
 
@@ -44,12 +45,15 @@ const CheckboxInput = ({ question, value, option, optionIndex, disabled, onCreat
 
     if (checked) {
       onDelete(value)
+      setAdditionalInputValue('')
     } else {
-      handleCreate(option, optionIndex)
+      handleCreate(option, optionIndex, additionalInputValue)
     }
   }
 
   const handleAdditionalValueChange = useDebouncedCallback((value, option, additionalInput) => {
+   setAdditionalInputValue(additionalInput)
+
     if (checked) {
       if (option.has_provider) {
         onUpdate(value, {
@@ -91,7 +95,12 @@ const CheckboxInput = ({ question, value, option, optionIndex, disabled, onCreat
           option.additional_input == 'text' && (
             <>
               <span>:</span>
-              <AdditionalTextInput className="ml-10" value={value} option={option} disabled={disabled} onChange={handleAdditionalValueChange} />
+              <AdditionalTextInput className="ml-10" value={value} option={option} disabled={disabled}
+                onChange={(v, o, input) => {
+                  setAdditionalInputValue(input)
+                  handleAdditionalValueChange(v, o, input)
+                }}
+              />
               <OptionHelp className="ml-10" option={option} />
             </>
           )
@@ -100,7 +109,12 @@ const CheckboxInput = ({ question, value, option, optionIndex, disabled, onCreat
           option.additional_input == 'textarea' && (
             <>
               <span>:</span>
-              <AdditionalTextareaInput value={value} option={option} disabled={disabled} onChange={handleAdditionalValueChange} />
+              <AdditionalTextareaInput value={value} option={option} disabled={disabled}
+                  onChange={(v, o, input) => {
+                    setAdditionalInputValue(input)
+                    handleAdditionalValueChange(v, o, input)
+                }}
+              />
               <div>
                 <OptionHelp option={option} />
               </div>

From 58272a5612c5b33102741028a55f6e458cc86bff Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Fri, 15 Aug 2025 18:55:08 +0200
Subject: [PATCH 06/14] Add SelectValueContainer to allow for links in select
 widgets in the interview

---
 rdmo/core/static/core/css/base.scss           |  4 +-
 .../components/main/widget/SelectInput.js     |  5 ++-
 .../main/widget/SelectValueContainer.js       | 44 +++++++++++++++++++
 rdmo/projects/assets/scss/interview.scss      |  6 +++
 4 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 rdmo/projects/assets/js/interview/components/main/widget/SelectValueContainer.js

diff --git a/rdmo/core/static/core/css/base.scss b/rdmo/core/static/core/css/base.scss
index 47d1b4a7b..40373e48f 100644
--- a/rdmo/core/static/core/css/base.scss
+++ b/rdmo/core/static/core/css/base.scss
@@ -500,8 +500,8 @@ li.has-warning > a.control-label > i {
 }
 
 // adjust background "hover" color in select2 to $link-color
-.select2-results__option--highlighted{
-    background-color: $link-color !important,
+.select2-results__option--highlighted {
+    background-color: $link-color !important
 }
 
 .cc-myself {
diff --git a/rdmo/projects/assets/js/interview/components/main/widget/SelectInput.js b/rdmo/projects/assets/js/interview/components/main/widget/SelectInput.js
index 53ba11f8c..7ab809ea9 100644
--- a/rdmo/projects/assets/js/interview/components/main/widget/SelectInput.js
+++ b/rdmo/projects/assets/js/interview/components/main/widget/SelectInput.js
@@ -8,7 +8,6 @@ import PropTypes from 'prop-types'
 import classNames from 'classnames'
 import { isEmpty, isNil } from 'lodash'
 import { useDebouncedCallback } from 'use-debounce'
-// import { convert } from 'html-to-text'
 
 import ProjectApi from '../../../api/ProjectApi'
 import { projectId } from '../../../utils/meta'
@@ -19,6 +18,7 @@ import { getValueOption } from '../../../utils/options'
 import OptionHelp from './common/OptionHelp'
 import OptionText from './common/OptionText'
 
+import SelectValueContainer from './SelectValueContainer'
 
 const SelectInput = ({ question, value, options, disabled, creatable, updateValue, buttons }) => {
 
@@ -104,7 +104,8 @@ const SelectInput = ({ question, value, options, disabled, creatable, updateValu
         <OptionText option={option} />
         <OptionHelp className="ml-10" option={option} />
       </span>
-    )
+    ),
+    components: { ValueContainer: SelectValueContainer }
   }
 
   return (
diff --git a/rdmo/projects/assets/js/interview/components/main/widget/SelectValueContainer.js b/rdmo/projects/assets/js/interview/components/main/widget/SelectValueContainer.js
new file mode 100644
index 000000000..a063be8d6
--- /dev/null
+++ b/rdmo/projects/assets/js/interview/components/main/widget/SelectValueContainer.js
@@ -0,0 +1,44 @@
+import React, { useRef, useEffect } from 'react'
+import PropTypes from 'prop-types'
+import { components } from 'react-select'
+
+const SelectValueContainer = (props) => {
+  const ref = useRef(null)
+
+  useEffect(() => {
+    if (!ref.current) return
+
+    const links = ref.current.querySelectorAll('a')
+    const handlers = []
+
+    links.forEach((link) => {
+      const handler = (e) => e.stopPropagation()
+
+      link.addEventListener('mousedown', handler)
+      link.setAttribute('target', '_blank')
+      link.setAttribute('rel', 'noopener noreferrer')
+
+      handlers.push({ link, handler })
+    })
+
+    return () => {
+      handlers.forEach(({ link, handler }) => {
+        link.removeEventListener('mousedown', handler)
+      })
+    }
+  }, [])
+
+  return (
+    <components.ValueContainer {...props}>
+      <span ref={ref} style={{ display: 'inline-flex', alignItems: 'center' }}>
+        {props.children}
+      </span>
+    </components.ValueContainer>
+  )
+}
+
+SelectValueContainer.propTypes = {
+  children: PropTypes.node
+}
+
+export default SelectValueContainer
diff --git a/rdmo/projects/assets/scss/interview.scss b/rdmo/projects/assets/scss/interview.scss
index 8a6979bac..b15fc2133 100644
--- a/rdmo/projects/assets/scss/interview.scss
+++ b/rdmo/projects/assets/scss/interview.scss
@@ -424,6 +424,12 @@ $variant-background-color: #f5f5f5 !default;
         .react-select__menu {
             z-index: 10;
         }
+
+        .react-select__option--is-selected {
+          a {
+            color: white;
+          }
+        }
     }
 }
 

From 2878c842b387641317241ff687847869785d5460 Mon Sep 17 00:00:00 2001
From: David Wallace <david.wallace@tu-darmstadt.de>
Date: Fri, 22 Aug 2025 09:38:57 +0200
Subject: [PATCH 07/14] locale(de): update german translations in .po

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
---
 rdmo/locale/de/LC_MESSAGES/django.po | 34 ++++++++++++++--------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/rdmo/locale/de/LC_MESSAGES/django.po b/rdmo/locale/de/LC_MESSAGES/django.po
index c21205a26..e67844d30 100644
--- a/rdmo/locale/de/LC_MESSAGES/django.po
+++ b/rdmo/locale/de/LC_MESSAGES/django.po
@@ -870,7 +870,7 @@ msgstr "Kommentar"
 
 #: conditions/models.py:51
 msgid "Additional internal information about this condition."
-msgstr "Zusätzliche interne Informationen über diese Bedingung."
+msgstr "Zusätzliche interne Informationen zur Bedingung."
 
 #: conditions/models.py:55 domain/models.py:40 options/models.py:39
 #: options/models.py:171 questions/models/catalog.py:56
@@ -1323,7 +1323,7 @@ msgstr "Der Pfad-Teil der URI für dieses Attribut (automatisch erstellt)."
 
 #: domain/models.py:36
 msgid "Additional information about this attribute."
-msgstr "Zusätzliche Informationen über dieses Attribut."
+msgstr "Zusätzliche Informationen zu diesem Attribut."
 
 #: domain/models.py:41
 msgid "Designates whether this attribute (and its descendants) can be changed."
@@ -1451,7 +1451,7 @@ msgstr "Der Pfad für die URI dieses Optionenset."
 
 #: options/models.py:35
 msgid "Additional internal information about this option set."
-msgstr "Zusätzliche interne Informationen über dieses Optionenset."
+msgstr "Zusätzliche interne Informationen zu diesem Optionenset."
 
 #: options/models.py:40
 msgid "Designates whether this option set (and its options) can be changed."
@@ -1522,7 +1522,7 @@ msgstr "Der Pfad für die URI dieser Option."
 
 #: options/models.py:167
 msgid "Additional internal information about this option."
-msgstr "Zusätzliche interne Informationen über diese Option."
+msgstr "Zusätzliche interne Informationen zum Option."
 
 #: options/models.py:172
 msgid "Designates whether this option can be changed."
@@ -2467,18 +2467,18 @@ msgid ""
 "I have a question regarding the project \"%(project_title)s\" on the page "
 "\"%(page_title)s\":"
 msgstr ""
-"Ich habe eine Frage zu dem Projekt „%(project_title)s“ auf der Seite "
+"Ich habe eine Frage zum Projekt „%(project_title)s“ auf der Seite "
 "„%(page_title)s“:"
 
 #: projects/templates/projects/email/project_contact_message.txt:10
 #, python-format
 msgid "I have a question regarding the project \"%(project_title)s\":"
-msgstr "Ich habe eine Frage zu dem Projekt „%(project_title)s“:"
+msgstr "Ich habe eine Frage zum Projekt „%(project_title)s“:"
 
 #: projects/templates/projects/email/project_contact_message.txt:18
 #, python-format
 msgid "In particular, about the question: %(question_text)s"
-msgstr "Insbesondere über die Frage: %(question_text)s"
+msgstr "Insbesondere zur Frage: %(question_text)s"
 
 #: projects/templates/projects/email/project_contact_message.txt:28
 msgid "Answer:"
@@ -3380,7 +3380,7 @@ msgstr "Der Pfad für die URI dieses Katalogs."
 
 #: questions/models/catalog.py:52
 msgid "Additional internal information about this catalog."
-msgstr "Zusätzliche interne Informationen über diesen Katalog."
+msgstr "Zusätzliche interne Informationen zu diesem Katalog."
 
 #: questions/models/catalog.py:57
 msgid ""
@@ -3511,7 +3511,7 @@ msgstr "Der Pfad für die URI dieser Aufgabe."
 
 #: questions/models/page.py:51
 msgid "Additional internal information about this page."
-msgstr "Zusätzliche interne Informationen über diese Seite."
+msgstr "Zusätzliche interne Informationen zu dieser Seite."
 
 #: questions/models/page.py:56
 msgid ""
@@ -3708,7 +3708,7 @@ msgstr "Der Pfad für die URI dieser Frage."
 
 #: questions/models/question.py:43
 msgid "Additional internal information about this question."
-msgstr "Zusätzliche interne Informationen über diesen Abschnitt."
+msgstr "Zusätzliche interne Informationen zu dieser Frage."
 
 #: questions/models/question.py:48
 msgid "Designates whether this question can be changed."
@@ -3913,7 +3913,7 @@ msgstr "Der Pfad für die URI dieses Fragensets."
 
 #: questions/models/questionset.py:46
 msgid "Additional internal information about this question set."
-msgstr "Zusätzliche interne Informationen über diese Fragenset."
+msgstr "Zusätzliche interne Informationen zu diesem Fragenset."
 
 #: questions/models/questionset.py:51
 msgid ""
@@ -4018,15 +4018,15 @@ msgstr ""
 
 #: questions/models/section.py:40
 msgid "The prefix for the URI of this section."
-msgstr "Das Präfix für die URI die dieses Abschnitts."
+msgstr "Das Präfix für die URI dieses Abschnitts."
 
 #: questions/models/section.py:45
 msgid "The path for the URI of this section."
-msgstr "Der Pfad für die URI die dieses Abschnitts."
+msgstr "Der Pfad für die URI dieses Abschnitts."
 
 #: questions/models/section.py:50
 msgid "Additional internal information about this section."
-msgstr "Zusätzliche interne Informationen über diesen Abschnitt."
+msgstr "Zusätzliche interne Informationen zu diesem Abschnitt."
 
 #: questions/models/section.py:55
 msgid ""
@@ -4038,7 +4038,7 @@ msgstr ""
 
 #: questions/models/section.py:60
 msgid "The pages of this section."
-msgstr "Der Seiten für diesen Abschnitt."
+msgstr "Die Seiten dieses Abschnitts."
 
 #: questions/models/section.py:65
 msgid "The sites that can edit this section (in a multi site setup)."
@@ -4199,7 +4199,7 @@ msgstr "Der Pfad für die URI dieser Aufgabe."
 
 #: tasks/models.py:36
 msgid "Additional internal information about this task."
-msgstr "Zusätzliche interne Informationen über diese Aufgabe."
+msgstr "Zusätzliche interne Informationen zu dieser Aufgabe."
 
 #: tasks/models.py:41
 msgid "Designates whether this task can be changed."
@@ -4329,7 +4329,7 @@ msgstr "Der Pfad für die URI dieser Ansicht."
 
 #: views/models.py:38
 msgid "Additional internal information about this view."
-msgstr "Zusätzliche interne Informationen über diese Ansicht."
+msgstr "Zusätzliche interne Informationen zu dieser Ansicht."
 
 #: views/models.py:43
 msgid "Designates whether this view can be changed."

From d1611a37209bfd99c28e0564a88e4408d31513d9 Mon Sep 17 00:00:00 2001
From: David Wallace <david.wallace@tu-darmstadt.de>
Date: Fri, 22 Aug 2025 09:43:40 +0200
Subject: [PATCH 08/14] Revert "locale(de): update german translations in .po"

This reverts commit 2878c842b387641317241ff687847869785d5460.
---
 rdmo/locale/de/LC_MESSAGES/django.po | 34 ++++++++++++++--------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/rdmo/locale/de/LC_MESSAGES/django.po b/rdmo/locale/de/LC_MESSAGES/django.po
index e67844d30..c21205a26 100644
--- a/rdmo/locale/de/LC_MESSAGES/django.po
+++ b/rdmo/locale/de/LC_MESSAGES/django.po
@@ -870,7 +870,7 @@ msgstr "Kommentar"
 
 #: conditions/models.py:51
 msgid "Additional internal information about this condition."
-msgstr "Zusätzliche interne Informationen zur Bedingung."
+msgstr "Zusätzliche interne Informationen über diese Bedingung."
 
 #: conditions/models.py:55 domain/models.py:40 options/models.py:39
 #: options/models.py:171 questions/models/catalog.py:56
@@ -1323,7 +1323,7 @@ msgstr "Der Pfad-Teil der URI für dieses Attribut (automatisch erstellt)."
 
 #: domain/models.py:36
 msgid "Additional information about this attribute."
-msgstr "Zusätzliche Informationen zu diesem Attribut."
+msgstr "Zusätzliche Informationen über dieses Attribut."
 
 #: domain/models.py:41
 msgid "Designates whether this attribute (and its descendants) can be changed."
@@ -1451,7 +1451,7 @@ msgstr "Der Pfad für die URI dieses Optionenset."
 
 #: options/models.py:35
 msgid "Additional internal information about this option set."
-msgstr "Zusätzliche interne Informationen zu diesem Optionenset."
+msgstr "Zusätzliche interne Informationen über dieses Optionenset."
 
 #: options/models.py:40
 msgid "Designates whether this option set (and its options) can be changed."
@@ -1522,7 +1522,7 @@ msgstr "Der Pfad für die URI dieser Option."
 
 #: options/models.py:167
 msgid "Additional internal information about this option."
-msgstr "Zusätzliche interne Informationen zum Option."
+msgstr "Zusätzliche interne Informationen über diese Option."
 
 #: options/models.py:172
 msgid "Designates whether this option can be changed."
@@ -2467,18 +2467,18 @@ msgid ""
 "I have a question regarding the project \"%(project_title)s\" on the page "
 "\"%(page_title)s\":"
 msgstr ""
-"Ich habe eine Frage zum Projekt „%(project_title)s“ auf der Seite "
+"Ich habe eine Frage zu dem Projekt „%(project_title)s“ auf der Seite "
 "„%(page_title)s“:"
 
 #: projects/templates/projects/email/project_contact_message.txt:10
 #, python-format
 msgid "I have a question regarding the project \"%(project_title)s\":"
-msgstr "Ich habe eine Frage zum Projekt „%(project_title)s“:"
+msgstr "Ich habe eine Frage zu dem Projekt „%(project_title)s“:"
 
 #: projects/templates/projects/email/project_contact_message.txt:18
 #, python-format
 msgid "In particular, about the question: %(question_text)s"
-msgstr "Insbesondere zur Frage: %(question_text)s"
+msgstr "Insbesondere über die Frage: %(question_text)s"
 
 #: projects/templates/projects/email/project_contact_message.txt:28
 msgid "Answer:"
@@ -3380,7 +3380,7 @@ msgstr "Der Pfad für die URI dieses Katalogs."
 
 #: questions/models/catalog.py:52
 msgid "Additional internal information about this catalog."
-msgstr "Zusätzliche interne Informationen zu diesem Katalog."
+msgstr "Zusätzliche interne Informationen über diesen Katalog."
 
 #: questions/models/catalog.py:57
 msgid ""
@@ -3511,7 +3511,7 @@ msgstr "Der Pfad für die URI dieser Aufgabe."
 
 #: questions/models/page.py:51
 msgid "Additional internal information about this page."
-msgstr "Zusätzliche interne Informationen zu dieser Seite."
+msgstr "Zusätzliche interne Informationen über diese Seite."
 
 #: questions/models/page.py:56
 msgid ""
@@ -3708,7 +3708,7 @@ msgstr "Der Pfad für die URI dieser Frage."
 
 #: questions/models/question.py:43
 msgid "Additional internal information about this question."
-msgstr "Zusätzliche interne Informationen zu dieser Frage."
+msgstr "Zusätzliche interne Informationen über diesen Abschnitt."
 
 #: questions/models/question.py:48
 msgid "Designates whether this question can be changed."
@@ -3913,7 +3913,7 @@ msgstr "Der Pfad für die URI dieses Fragensets."
 
 #: questions/models/questionset.py:46
 msgid "Additional internal information about this question set."
-msgstr "Zusätzliche interne Informationen zu diesem Fragenset."
+msgstr "Zusätzliche interne Informationen über diese Fragenset."
 
 #: questions/models/questionset.py:51
 msgid ""
@@ -4018,15 +4018,15 @@ msgstr ""
 
 #: questions/models/section.py:40
 msgid "The prefix for the URI of this section."
-msgstr "Das Präfix für die URI dieses Abschnitts."
+msgstr "Das Präfix für die URI die dieses Abschnitts."
 
 #: questions/models/section.py:45
 msgid "The path for the URI of this section."
-msgstr "Der Pfad für die URI dieses Abschnitts."
+msgstr "Der Pfad für die URI die dieses Abschnitts."
 
 #: questions/models/section.py:50
 msgid "Additional internal information about this section."
-msgstr "Zusätzliche interne Informationen zu diesem Abschnitt."
+msgstr "Zusätzliche interne Informationen über diesen Abschnitt."
 
 #: questions/models/section.py:55
 msgid ""
@@ -4038,7 +4038,7 @@ msgstr ""
 
 #: questions/models/section.py:60
 msgid "The pages of this section."
-msgstr "Die Seiten dieses Abschnitts."
+msgstr "Der Seiten für diesen Abschnitt."
 
 #: questions/models/section.py:65
 msgid "The sites that can edit this section (in a multi site setup)."
@@ -4199,7 +4199,7 @@ msgstr "Der Pfad für die URI dieser Aufgabe."
 
 #: tasks/models.py:36
 msgid "Additional internal information about this task."
-msgstr "Zusätzliche interne Informationen zu dieser Aufgabe."
+msgstr "Zusätzliche interne Informationen über diese Aufgabe."
 
 #: tasks/models.py:41
 msgid "Designates whether this task can be changed."
@@ -4329,7 +4329,7 @@ msgstr "Der Pfad für die URI dieser Ansicht."
 
 #: views/models.py:38
 msgid "Additional internal information about this view."
-msgstr "Zusätzliche interne Informationen zu dieser Ansicht."
+msgstr "Zusätzliche interne Informationen über diese Ansicht."
 
 #: views/models.py:43
 msgid "Designates whether this view can be changed."

From 9becdb2ac92763ba5848ee9a60c9855d3b83301b Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Fri, 22 Aug 2025 12:53:01 +0200
Subject: [PATCH 09/14] Add useAdditionalInputs hook

---
 .../components/main/widget/CheckboxInput.js   | 38 ++++++++++--------
 .../components/main/widget/RadioInput.js      | 24 ++++++-----
 .../main/widget/common/AdditionalTextInput.js | 40 ++++++-------------
 .../widget/common/AdditionalTextareaInput.js  | 27 ++++---------
 .../js/interview/hooks/useAdditionalInputs.js | 26 ++++++++++++
 5 files changed, 81 insertions(+), 74 deletions(-)
 create mode 100644 rdmo/projects/assets/js/interview/hooks/useAdditionalInputs.js

diff --git a/rdmo/projects/assets/js/interview/components/main/widget/CheckboxInput.js b/rdmo/projects/assets/js/interview/components/main/widget/CheckboxInput.js
index 94499ceca..61ae431f9 100644
--- a/rdmo/projects/assets/js/interview/components/main/widget/CheckboxInput.js
+++ b/rdmo/projects/assets/js/interview/components/main/widget/CheckboxInput.js
@@ -1,9 +1,10 @@
-import React, {useRef, useState} from 'react'
+import React, { useRef } from 'react'
 import PropTypes from 'prop-types'
 import classNames from 'classnames'
 import { useDebouncedCallback } from 'use-debounce'
 import { isEmpty, isNil } from 'lodash'
 
+import useAdditionalInputs from '../../../hooks/useAdditionalInputs'
 import useAdjustLabel from '../../../hooks/useAdjustLabel'
 
 import AdditionalTextInput from './common/AdditionalTextInput'
@@ -14,7 +15,7 @@ import OptionText from './common/OptionText'
 const CheckboxInput = ({ question, value, option, optionIndex, disabled, onCreate, onUpdate, onDelete }) => {
 
   const ref = useRef(null)
-  const [additionalInputValue, setAdditionalInputValue] = useState('')
+  const [getAdditionalInput, setAdditionalInput] = useAdditionalInputs(value, [option])
 
   useAdjustLabel(ref)
 
@@ -41,19 +42,17 @@ const CheckboxInput = ({ question, value, option, optionIndex, disabled, onCreat
   }
 
   const handleChange = () => {
-    handleAdditionalValueChange.cancel()
+    handleAdditionalInputChange.cancel()
 
     if (checked) {
       onDelete(value)
-      setAdditionalInputValue('')
+      setAdditionalInput(option, '')
     } else {
-      handleCreate(option, optionIndex, additionalInputValue)
+      handleCreate(option, optionIndex, getAdditionalInput(option))
     }
   }
 
-  const handleAdditionalValueChange = useDebouncedCallback((value, option, additionalInput) => {
-   setAdditionalInputValue(additionalInput)
-
+  const handleAdditionalInputChange = useDebouncedCallback((value, option, additionalInput) => {
     if (checked) {
       if (option.has_provider) {
         onUpdate(value, {
@@ -73,7 +72,7 @@ const CheckboxInput = ({ question, value, option, optionIndex, disabled, onCreat
     } else {
       handleCreate(option, optionIndex, additionalInput)
     }
-  }, 500)
+  }, 2000)
 
   return (
     <div ref={ref} className={classnames}>
@@ -95,10 +94,13 @@ const CheckboxInput = ({ question, value, option, optionIndex, disabled, onCreat
           option.additional_input == 'text' && (
             <>
               <span>:</span>
-              <AdditionalTextInput className="ml-10" value={value} option={option} disabled={disabled}
-                onChange={(v, o, input) => {
-                  setAdditionalInputValue(input)
-                  handleAdditionalValueChange(v, o, input)
+              <AdditionalTextInput
+                className="ml-10"
+                inputValue={getAdditionalInput(option)}
+                disabled={disabled}
+                onChange={(additionalInput) => {
+                  setAdditionalInput(option, additionalInput)
+                  handleAdditionalInputChange(value, option, additionalInput)
                 }}
               />
               <OptionHelp className="ml-10" option={option} />
@@ -109,10 +111,12 @@ const CheckboxInput = ({ question, value, option, optionIndex, disabled, onCreat
           option.additional_input == 'textarea' && (
             <>
               <span>:</span>
-              <AdditionalTextareaInput value={value} option={option} disabled={disabled}
-                  onChange={(v, o, input) => {
-                    setAdditionalInputValue(input)
-                    handleAdditionalValueChange(v, o, input)
+              <AdditionalTextareaInput
+                inputValue={getAdditionalInput(option)}
+                disabled={disabled}
+                onChange={(additionalInput) => {
+                  setAdditionalInput(option, additionalInput)
+                  handleAdditionalInputChange(value, option, additionalInput)
                 }}
               />
               <div>
diff --git a/rdmo/projects/assets/js/interview/components/main/widget/RadioInput.js b/rdmo/projects/assets/js/interview/components/main/widget/RadioInput.js
index a301b0690..28a22ffa5 100644
--- a/rdmo/projects/assets/js/interview/components/main/widget/RadioInput.js
+++ b/rdmo/projects/assets/js/interview/components/main/widget/RadioInput.js
@@ -7,6 +7,7 @@ import { isEmpty } from 'lodash'
 import { getQuestionTextId, getQuestionHelpId } from '../../../utils/question'
 import { isDefaultValue } from '../../../utils/value'
 
+import useAdditionalInputs from '../../../hooks/useAdditionalInputs'
 import useAdjustLabel from '../../../hooks/useAdjustLabel'
 
 import AdditionalTextInput from './common/AdditionalTextInput'
@@ -17,11 +18,12 @@ import OptionText from './common/OptionText'
 const RadioInput = ({ question, value, options, disabled, updateValue, buttons }) => {
 
   const ref = useRef(null)
+  const [getAdditionalInput, setAdditionalInput] = useAdditionalInputs(value, options)
 
   useAdjustLabel(ref)
 
   const handleChange = (option) => {
-    handleAdditionalValueChange.cancel()
+    handleAdditionalInputChange.cancel()
 
     if (option.has_provider) {
       updateValue(value, {
@@ -32,7 +34,7 @@ const RadioInput = ({ question, value, options, disabled, updateValue, buttons }
       })
     } else {
       updateValue(value, {
-        text: option.default_text || '',
+        text: getAdditionalInput(option) || option.default_text || '',
         option: option.id,
         unit: question.unit,
         value_type: question.value_type
@@ -40,7 +42,7 @@ const RadioInput = ({ question, value, options, disabled, updateValue, buttons }
     }
   }
 
-  const handleAdditionalValueChange = useDebouncedCallback((value, option, additionalInput) => {
+  const handleAdditionalInputChange = useDebouncedCallback((value, option, additionalInput) => {
     updateValue(value, {
       option: option.id,
       text: additionalInput,
@@ -87,10 +89,12 @@ const RadioInput = ({ question, value, options, disabled, updateValue, buttons }
                           <span>:</span>
                           <AdditionalTextInput
                             className="ml-10"
-                            value={value}
-                            option={option}
+                            inputValue={getAdditionalInput(option)}
                             disabled={disabled}
-                            onChange={handleAdditionalValueChange}
+                            onChange={(additionalInput) => {
+                              setAdditionalInput(option, additionalInput)
+                              handleAdditionalInputChange(value, option, additionalInput)
+                            }}
                           />
                           <OptionHelp className="ml-10" option={option} />
                         </>
@@ -101,10 +105,12 @@ const RadioInput = ({ question, value, options, disabled, updateValue, buttons }
                         <>
                           <span>:</span>
                           <AdditionalTextareaInput
-                            value={value}
-                            option={option}
+                            inputValue={getAdditionalInput(option)}
                             disabled={disabled}
-                            onChange={handleAdditionalValueChange}
+                            onChange={(additionalInput) => {
+                              setAdditionalInput(option, additionalInput)
+                              handleAdditionalInputChange(value, option, additionalInput)
+                            }}
                           />
                           <div>
                             <OptionHelp option={option} />
diff --git a/rdmo/projects/assets/js/interview/components/main/widget/common/AdditionalTextInput.js b/rdmo/projects/assets/js/interview/components/main/widget/common/AdditionalTextInput.js
index 22e371a68..1eb167c7c 100644
--- a/rdmo/projects/assets/js/interview/components/main/widget/common/AdditionalTextInput.js
+++ b/rdmo/projects/assets/js/interview/components/main/widget/common/AdditionalTextInput.js
@@ -1,39 +1,23 @@
-import React, { useState, useEffect } from 'react'
+import React from 'react'
 import PropTypes from 'prop-types'
-import { get, isNil } from 'lodash'
-
-const AdditionalTextInput = ({ className, value, option, disabled, onChange }) => {
-  const [inputValue, setInputValue] = useState('')
-
-  useEffect(() => {
-    if (isNil(value)) {
-      setInputValue('')
-    } else {
-      setInputValue(value.option == option.id ? value.text : '')
-    }
-  }, [get(value, 'id'), get(value, 'text'), get(value, 'option'), get(value, 'external_id')])
+import classNames from 'classnames'
 
+const AdditionalTextInput = ({ className, inputValue, disabled, onChange }) => {
   return (
-    <span className={className}>
-      <input
-        type="text"
-        className="form-control input-sm"
-        disabled={disabled}
-        aria-label={gettext('Additional input')}
-        value={inputValue}
-        onChange={(event) => {
-          setInputValue(event.target.value)
-          onChange(value, option, event.target.value)
-        }}
-      />
-    </span>
+    <input
+      type="text"
+      className={classNames('form-control input-sm', className)}
+      disabled={disabled}
+      aria-label={gettext('Additional input')}
+      value={inputValue}
+      onChange={(event) => onChange(event.target.value)}
+    />
   )
 }
 
 AdditionalTextInput.propTypes = {
   className: PropTypes.string,
-  value: PropTypes.object,
-  option: PropTypes.object.isRequired,
+  inputValue: PropTypes.string,
   disabled: PropTypes.bool,
   onChange: PropTypes.func.isRequired
 }
diff --git a/rdmo/projects/assets/js/interview/components/main/widget/common/AdditionalTextareaInput.js b/rdmo/projects/assets/js/interview/components/main/widget/common/AdditionalTextareaInput.js
index 881fd115c..99358505f 100644
--- a/rdmo/projects/assets/js/interview/components/main/widget/common/AdditionalTextareaInput.js
+++ b/rdmo/projects/assets/js/interview/components/main/widget/common/AdditionalTextareaInput.js
@@ -1,36 +1,23 @@
-import React, { useState, useEffect } from 'react'
+import React from 'react'
 import PropTypes from 'prop-types'
-import { get, isNil } from 'lodash'
-
-const AdditionalTextareaInput = ({ value, option, disabled, onChange }) => {
-  const [inputValue, setInputValue] = useState('')
-
-  useEffect(() => {
-    if (isNil(value)) {
-      setInputValue('')
-    } else {
-      setInputValue(value.option == option.id ? value.text : '')
-    }
-  }, [get(value, 'id'), get(value, 'text'), get(value, 'option'), get(value, 'external_id')])
+import classNames from 'classnames'
 
+const AdditionalTextareaInput = ({ className, inputValue, disabled, onChange }) => {
   return (
     <textarea
       rows={4}
-      className="form-control input-sm"
+      className={classNames('form-control input-sm', className)}
       disabled={disabled}
       aria-label={gettext('Additional input')}
       value={inputValue}
-      onChange={(event) => {
-        setInputValue(event.target.value)
-        onChange(value, option, event.target.value)
-      }}
+      onChange={(event) => onChange(event.target.value)}
     />
   )
 }
 
 AdditionalTextareaInput.propTypes = {
-  value: PropTypes.object,
-  option: PropTypes.object.isRequired,
+  className: PropTypes.string,
+  inputValue: PropTypes.string,
   disabled: PropTypes.bool,
   onChange: PropTypes.func.isRequired
 }
diff --git a/rdmo/projects/assets/js/interview/hooks/useAdditionalInputs.js b/rdmo/projects/assets/js/interview/hooks/useAdditionalInputs.js
new file mode 100644
index 000000000..46c0812df
--- /dev/null
+++ b/rdmo/projects/assets/js/interview/hooks/useAdditionalInputs.js
@@ -0,0 +1,26 @@
+import { useState, useEffect } from 'react'
+import { get, isNil } from 'lodash'
+
+const useAdditionalInputs = (value, options) => {
+  const [additionalInputs, setAdditionalInputs] = useState({})
+
+  useEffect(() => {
+    if (!isNil(value)) {
+      setAdditionalInputs(options.reduce((additionalInputs, option) => {
+        if (value.option == option.id) {
+          additionalInputs[option.id] = value.text
+        }
+        return additionalInputs
+      }, {}))
+    }
+  }, [get(value, 'id'), get(value, 'text'), get(value, 'option'), get(value, 'external_id')])
+
+  return [
+    (option) => additionalInputs[option.id] || '',
+    (option, additionalInput) => setAdditionalInputs({
+      ...additionalInputs, [option.id]: additionalInput
+    })
+  ]
+}
+
+export default useAdditionalInputs

From 30b9f5fc6cac8269191c18fa241fd0f3ae251386 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Fri, 22 Aug 2025 13:01:54 +0200
Subject: [PATCH 10/14] Fix timeout

---
 .../assets/js/interview/components/main/widget/CheckboxInput.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rdmo/projects/assets/js/interview/components/main/widget/CheckboxInput.js b/rdmo/projects/assets/js/interview/components/main/widget/CheckboxInput.js
index 61ae431f9..a21a70373 100644
--- a/rdmo/projects/assets/js/interview/components/main/widget/CheckboxInput.js
+++ b/rdmo/projects/assets/js/interview/components/main/widget/CheckboxInput.js
@@ -72,7 +72,7 @@ const CheckboxInput = ({ question, value, option, optionIndex, disabled, onCreat
     } else {
       handleCreate(option, optionIndex, additionalInput)
     }
-  }, 2000)
+  }, 500)
 
   return (
     <div ref={ref} className={classnames}>

From 53107db30c0d8962b0c6084787f7848cffa525db Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Fri, 22 Aug 2025 13:43:03 +0200
Subject: [PATCH 11/14] Fix erase value behavior

---
 .../projects/assets/js/interview/hooks/useAdditionalInputs.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rdmo/projects/assets/js/interview/hooks/useAdditionalInputs.js b/rdmo/projects/assets/js/interview/hooks/useAdditionalInputs.js
index 46c0812df..a3be4a255 100644
--- a/rdmo/projects/assets/js/interview/hooks/useAdditionalInputs.js
+++ b/rdmo/projects/assets/js/interview/hooks/useAdditionalInputs.js
@@ -5,7 +5,9 @@ const useAdditionalInputs = (value, options) => {
   const [additionalInputs, setAdditionalInputs] = useState({})
 
   useEffect(() => {
-    if (!isNil(value)) {
+    if (isNil(value)) {
+      setAdditionalInputs({})
+    } else {
       setAdditionalInputs(options.reduce((additionalInputs, option) => {
         if (value.option == option.id) {
           additionalInputs[option.id] = value.text

From 70d7c903ee550b6467c36efe81985859bde92815 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Fri, 22 Aug 2025 14:06:28 +0200
Subject: [PATCH 12/14] Add useIdle hook to fix "double clicks" in
 CheckboxInput

---
 .../components/main/widget/CheckboxInput.js     | 17 +++++++++++------
 .../assets/js/interview/hooks/useIdle.js        | 11 +++++++++++
 2 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 rdmo/projects/assets/js/interview/hooks/useIdle.js

diff --git a/rdmo/projects/assets/js/interview/components/main/widget/CheckboxInput.js b/rdmo/projects/assets/js/interview/components/main/widget/CheckboxInput.js
index a21a70373..026599b8e 100644
--- a/rdmo/projects/assets/js/interview/components/main/widget/CheckboxInput.js
+++ b/rdmo/projects/assets/js/interview/components/main/widget/CheckboxInput.js
@@ -6,6 +6,7 @@ import { isEmpty, isNil } from 'lodash'
 
 import useAdditionalInputs from '../../../hooks/useAdditionalInputs'
 import useAdjustLabel from '../../../hooks/useAdjustLabel'
+import useIdle from '../../../hooks/useIdle'
 
 import AdditionalTextInput from './common/AdditionalTextInput'
 import AdditionalTextareaInput from './common/AdditionalTextareaInput'
@@ -16,6 +17,7 @@ const CheckboxInput = ({ question, value, option, optionIndex, disabled, onCreat
 
   const ref = useRef(null)
   const [getAdditionalInput, setAdditionalInput] = useAdditionalInputs(value, [option])
+  const [idle, setIdle] = useIdle([value])
 
   useAdjustLabel(ref)
 
@@ -42,13 +44,16 @@ const CheckboxInput = ({ question, value, option, optionIndex, disabled, onCreat
   }
 
   const handleChange = () => {
-    handleAdditionalInputChange.cancel()
+    if (idle) {
+      setIdle(false)
+      handleAdditionalInputChange.cancel()
 
-    if (checked) {
-      onDelete(value)
-      setAdditionalInput(option, '')
-    } else {
-      handleCreate(option, optionIndex, getAdditionalInput(option))
+      if (checked) {
+        onDelete(value)
+        setAdditionalInput(option, '')
+      } else {
+        handleCreate(option, optionIndex, getAdditionalInput(option))
+      }
     }
   }
 
diff --git a/rdmo/projects/assets/js/interview/hooks/useIdle.js b/rdmo/projects/assets/js/interview/hooks/useIdle.js
new file mode 100644
index 000000000..80c03d700
--- /dev/null
+++ b/rdmo/projects/assets/js/interview/hooks/useIdle.js
@@ -0,0 +1,11 @@
+import { useState, useEffect } from 'react'
+
+const useIdle = (dependencies) => {
+  const [idle, setIdle] = useState(true)
+
+  useEffect(() => setIdle(true), dependencies)
+
+  return [idle, setIdle]
+}
+
+export default useIdle

From 1aa9c71c7de7d678cb59128578f984b2137faab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Heinz-Alexander=20F=C3=BCtterer?=
 <35225576+afuetterer@users.noreply.github.com>
Date: Fri, 5 Sep 2025 11:12:40 +0200
Subject: [PATCH 13/14] chore: remove obsolete filter for warnings

---
 pyproject.toml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 9e542756e..16540a6a0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -208,12 +208,6 @@ filterwarnings = [
   # fail on RemovedInDjango50Warning exception
   "error::django.utils.deprecation.RemovedInDjango50Warning",
 
-  # ignore warnings raised from within coreapi 2.3.3
-  "ignore:pkg_resources is deprecated as an API:DeprecationWarning",
-
-  # ignore warning from rest_framework about coreapi
-  "ignore:CoreAPI compatibility is deprecated and will be removed in DRF 3.17:rest_framework.RemovedInDRF317Warning",
-
   # ignore warnings raised by widget_tweaks.py
   "ignore:'maxsplit' is passed as positional argument",
 

From c26072e723dee27e4555a46123a160b3e5f991cf Mon Sep 17 00:00:00 2001
From: David Wallace <david.wallace@tu-darmstadt.de>
Date: Fri, 19 Sep 2025 13:08:39 +0200
Subject: [PATCH 14/14] bump version to 2.4.0

Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
---
 rdmo/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rdmo/__init__.py b/rdmo/__init__.py
index ed5cc1722..3d67cd6bb 100644
--- a/rdmo/__init__.py
+++ b/rdmo/__init__.py
@@ -1 +1 @@
-__version__ = "2.3.3"
+__version__ = "2.4.0"