From 752ec44d435f7f6b2f2a1e569b0d54202dbf3b7b Mon Sep 17 00:00:00 2001 From: matic_t Date: Fri, 7 Aug 2020 01:34:47 -0700 Subject: [PATCH] fixing double_list_getter --- src/message/common_accessors.py | 7 +++++-- src/message/translation_edit.py | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/message/common_accessors.py b/src/message/common_accessors.py index ed961c1..f71e6e9 100644 --- a/src/message/common_accessors.py +++ b/src/message/common_accessors.py @@ -10,13 +10,16 @@ def generic_list_getter(): return result # Formats data from inputs to name-value objects -def double_list_getter(firstParameter, secondParameter): +def double_list_getter(firstParameter, secondParameter, allowEmptyField = False): result = [] for row in document.getElementsByClassName("double-list-row"): firstValue = row.querySelector("." + firstParameter + "-input").value secondValue = row.querySelector("." + secondParameter + "-input").value - if ("" in [firstValue, secondValue]): + if (allowEmptyField is False and '' in [firstValue, secondValue]): + continue + + if (allowEmptyField is True and all('' == value or value.isspace() for value in [firstValue, secondValue])): continue result.append({firstParameter: firstValue, secondParameter: secondValue}) diff --git a/src/message/translation_edit.py b/src/message/translation_edit.py index daa07bd..55820be 100644 --- a/src/message/translation_edit.py +++ b/src/message/translation_edit.py @@ -13,8 +13,8 @@ class EditTranslation(DataChgClickMessage): self.old_cluster_idx = self.get_arg(1, int) self.translation.translation = document.getElementById("etv").value -# This could be dangerous if generic_list_getter is getting data from any other list as well. - self.translation.explanationList = common_accessors.generic_list_getter() +# This could be dangerous if double_list_getter is getting data from any other list as well. + self.translation.explanationList = common_accessors.double_list_getter('value', 'language', True) # common_accessors.label_list_getter() self.translation.tags = common_accessors.label_list_getter()