From ce5895abfde43bed41ad3b4918d9345a4314d557 Mon Sep 17 00:00:00 2001 From: moeez96 Date: Thu, 23 Apr 2020 13:32:40 +0500 Subject: [PATCH 1/4] MCKIN-15914 Tips should not show if empty --- .../templates/html/tip_choice_group.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/problem_builder/templates/html/tip_choice_group.html b/problem_builder/templates/html/tip_choice_group.html index 7324c0b8..6fe59d93 100644 --- a/problem_builder/templates/html/tip_choice_group.html +++ b/problem_builder/templates/html/tip_choice_group.html @@ -1,6 +1,8 @@ -
- {% for tip_html in tips_html %} - {{ tip_html|safe }} - {% endfor %} -
- +{% if tips_html %} +
+ {% for tip_html in tips_html %} + {{ tip_html|safe }} + {% endfor %} +
+ +{% endif %} \ No newline at end of file From 99c6825ab57be9884f4305b859e94902a5652047 Mon Sep 17 00:00:00 2001 From: moeez96 Date: Thu, 23 Apr 2020 14:02:55 +0500 Subject: [PATCH 2/4] Add line break --- problem_builder/templates/html/tip_choice_group.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/problem_builder/templates/html/tip_choice_group.html b/problem_builder/templates/html/tip_choice_group.html index 6fe59d93..94a9dfb8 100644 --- a/problem_builder/templates/html/tip_choice_group.html +++ b/problem_builder/templates/html/tip_choice_group.html @@ -5,4 +5,4 @@ {% endfor %} -{% endif %} \ No newline at end of file +{% endif %} From e6a92ddceee300a8261927ec5db5281e23c22ac1 Mon Sep 17 00:00:00 2001 From: moeez96 Date: Thu, 23 Apr 2020 15:15:16 +0500 Subject: [PATCH 3/4] increment version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3aeae709..dc3c413d 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ # Constants ######################################################### -VERSION = '3.4.16' +VERSION = '3.4.17' # Functions ######################################################### From 8d4df6a5f41edc39a37ce7a4fed9a174c094e5b8 Mon Sep 17 00:00:00 2001 From: moeez96 Date: Thu, 23 Apr 2020 15:45:59 +0500 Subject: [PATCH 4/4] re-run tests