jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/338969 )
Change subject: Fix json dump and parse logic
......................................................................
Fix json dump and parse logic
Bug: T156477
Change-Id: I512186b7f02db2dfaf3e62ff621f1c56468fa226
---
M recommendation/web/gapfinder.py
M recommendation/web/templates/index.html
M setup.py
3 files changed, 11 insertions(+), 11 deletions(-)
Approvals:
Nschaaf: Looks good to me, approved
jenkins-bot: Verified
diff --git a/recommendation/web/gapfinder.py b/recommendation/web/gapfinder.py
index f73e468..76ef734 100644
--- a/recommendation/web/gapfinder.py
+++ b/recommendation/web/gapfinder.py
@@ -10,11 +10,11 @@
@gapfinder.route('/')
def home():
- s = request.args.get('s')
- t = request.args.get('t')
- seed = request.args.get('seed')
- search = request.args.get('search')
- rank_method = request.args.get('rank_method')
+ s = request.args.get('s', '')
+ t = request.args.get('t', '')
+ seed = request.args.get('seed', '')
+ search = request.args.get('search', '')
+ rank_method = request.args.get('rank_method', '')
pairs = language_pairs.get_language_pairs()
return render_template(
'index.html',
diff --git a/recommendation/web/templates/index.html
b/recommendation/web/templates/index.html
index 32127e4..61a4955 100644
--- a/recommendation/web/templates/index.html
+++ b/recommendation/web/templates/index.html
@@ -58,11 +58,11 @@
window.translationAppGlobals = {
languagePairs: JSON.parse('{{ language_pairs | safe }}'),
languageToDomainMapping: JSON.parse('{{
language_to_domain_mapping | safe }}'),
- s: '{{ s if s else '' }}',
- t: '{{ t if t else '' }}',
- seed: '{{ seed if seed else '' }}',
- search: '{{ search if search else '' }}',
- rankMethod: '{{ rank_method if rank_method else '' }}',
+ s: JSON.parse('{{ s | safe }}'),
+ t: JSON.parse('{{ t | safe }}'),
+ seed: JSON.parse('{{ seed | safe }}'),
+ search: JSON.parse('{{ search | safe }}'),
+ rankMethod: JSON.parse('{{ rank_method | safe }}'),
defaultSearch: '{{ default_search }}',
personalBlacklistKey: 'personal.blacklist',
diff --git a/setup.py b/setup.py
index 33a9014..be22ca6 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
setup(
name='recommendation',
- version='0.2.4',
+ version='0.2.5',
url='https://github.com/wikimedia/research-recommendation-api',
license='Apache Software License',
maintainer='Wikimedia Research',
--
To view, visit https://gerrit.wikimedia.org/r/338969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I512186b7f02db2dfaf3e62ff621f1c56468fa226
Gerrit-PatchSet: 1
Gerrit-Project: research/recommendation-api
Gerrit-Branch: master
Gerrit-Owner: Nschaaf <[email protected]>
Gerrit-Reviewer: Nschaaf <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
