Refs jupyterhub#756 - allow dropdown text for unlisted choice to be c…

…onfigurable
batpad · Sep 2, 2023 · 8697732 · 8697732
1 parent 156245d
commit 8697732
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/kubespawner/spawner.py b/kubespawner/spawner.py
@@ -1543,6 +1543,7 @@ def _validate_image_pull_secrets(self, proposal):
             selected "Other" as a choice:
             - `enabled`: Boolean, whether the free form input should be enabled
             - `display_name`: String, label for input field
+            - `other_text`: Optional, text to show in Select Dropdown for Other option
             - `validation_regex`: Optional, regex that the free form input should match - eg. ^pangeo/.*$
             - `validation_message`: Optional, validation message for the regex. Should describe the required
                input format in a human-readable way.
@@ -1604,6 +1605,7 @@ def _validate_image_pull_secrets(self, proposal):
                             },
                             'unlisted_choice': {
                                 'enabled': True,
+                                'other_text': 'Enter image manually',
                                 'display_name': 'Other image',
                                 'validation_regex': '^jupyter/.+:.+$',
                                 'validation_message': 'Must be an image matching ^jupyter/<name>:<tag>$',

diff --git a/kubespawner/templates/form.html b/kubespawner/templates/form.html
@@ -27,7 +27,13 @@ <h3>{{ profile.display_name }}</h3>
                       <option value="{{ k }}" {% if choice.default %}selected{% endif %}>{{ choice.display_name }}</option>
                     {%- endfor %}
                     {%- if option['unlisted_choice'] and option['unlisted_choice']['enabled'] %}
-                      <option value="unlisted-choice">Other...</option>
+                      <option value="unlisted-choice">
+                        {%- if option['unlisted_choice']['other_text'] %}
+                          {{ option['unlisted_choice']['other_text'] }}
+                        {%- else %}
+                          Other...
+                        {%- endif %}
+                      </option>
                     {%- endif %}
                   </select>
                 </div>