fix: allow None for columns.default; remove debug log statement

fix occasional error that appears particularly on new processors with no expected default, i.e.: <option value="{{ choice }}"{% if choice in option_settings.default %} selected="selected"{% endif %}>{{ option_settings.options[choice] }}</option> TypeError: argument of type 'NoneType' is not iterable
digitalmethodsinitiative · Jan 22, 2025 · a1cdd4c · a1cdd4c
1 parent b60e8cf
commit a1cdd4c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/processors/filtering/unique_filter.py b/processors/filtering/unique_filter.py
@@ -145,6 +145,6 @@ def get_options(cls, parent_dataset=None, user=None):
 			columns = parent_dataset.get_columns()
 			options["columns"]["type"] = UserInput.OPTION_MULTI
 			options["columns"]["options"] = {v: v for v in columns}
-			options["columns"]["default"] = "body" if "body" in columns else None
+			options["columns"]["default"] = "body" if "body" in columns else ""
 
 		return options
diff --git a/webtool/static/js/fourcat.js b/webtool/static/js/fourcat.js
@@ -1851,8 +1851,6 @@ const ui_helpers = {
                 const other_field = 'option-' + requirement[1];
                 const other_element = form.querySelector("*[name='" + other_field + "']");
 
-                console.log(other_field);
-
                 if (!other_element) { //invalid reference
                     return;
                 }

diff --git a/webtool/templates/components/processor-option.html b/webtool/templates/components/processor-option.html
@@ -24,15 +24,15 @@
         <div class="multichoice-wrapper{% if option_settings.inline %} inline{% endif %}" style="flex-basis: 100%;">
             <select name="option-{{ option }}" multiple="multiple">
             {% for choice in option_settings.options %}
-                <option value="{{ choice }}"{% if choice in option_settings.default %} selected="selected"{% endif %}>{{ option_settings.options[choice] }}</option>
+                <option value="{{ choice }}"{% if option_settings.default and choice in option_settings.default %} selected="selected"{% endif %}>{{ option_settings.options[choice] }}</option>
             {% endfor %}
             </select>
         </div>
     {% elif option_settings.type == "multi_select" %}
         <div class="multi-select-wrapper">
             <select name="option-{{ option }}" multiple="multiple">
             {% for choice in option_settings.options %}
-                <option value="{{ choice }}"{% if choice in option_settings.default %} selected="selected"{% endif %}>{{ option_settings.options[choice] }}</option>
+                <option value="{{ choice }}"{% if option_settings.default and choice in option_settings.default %} selected="selected"{% endif %}>{{ option_settings.options[choice] }}</option>
             {% endfor %}
             </select>
         </div>