From d2c7fa80eb909ba90546e3e30af8ddef54eda19a Mon Sep 17 00:00:00 2001 From: ripoul Date: Thu, 26 Apr 2018 09:38:28 +0200 Subject: [PATCH 1/4] remove hard code http scheme of short url #4656 --- superset/views/core.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/superset/views/core.py b/superset/views/core.py index f66b70ef55a44..31e68cabbffe3 100755 --- a/superset/views/core.py +++ b/superset/views/core.py @@ -748,9 +748,10 @@ def shortner(self): obj = models.Url(url=url) db.session.add(obj) db.session.commit() + scheme = request.scheme return Response( - 'http://{request.headers[Host]}/{directory}?r={obj.id}'.format( - request=request, directory=directory, obj=obj), + '{scheme}://{request.headers[Host]}/{directory}?r={obj.id}'.format( + scheme = scheme, request=request, directory=directory, obj=obj), mimetype='text/plain') @expose('/msg/') From 3ba53c3b758d6947cd6e63ac307f2e3685a5998f Mon Sep 17 00:00:00 2001 From: ripoul Date: Thu, 26 Apr 2018 09:59:46 +0200 Subject: [PATCH 2/4] remove space --- superset/views/core.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/superset/views/core.py b/superset/views/core.py index 31e68cabbffe3..c67410ad0ec85 100755 --- a/superset/views/core.py +++ b/superset/views/core.py @@ -750,8 +750,8 @@ def shortner(self): db.session.commit() scheme = request.scheme return Response( - '{scheme}://{request.headers[Host]}/{directory}?r={obj.id}'.format( - scheme = scheme, request=request, directory=directory, obj=obj), + '{scheme}://{request.headers[Host]}/{directory}?r={obj.id}'.format( + scheme=scheme, request=request, directory=directory, obj=obj), mimetype='text/plain') @expose('/msg/') From 2ceeaf0fc4829d4a7764a58287f8b909d476b41c Mon Sep 17 00:00:00 2001 From: ripoul Date: Thu, 26 Apr 2018 10:55:31 +0200 Subject: [PATCH 3/4] add space --- superset/views/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/superset/views/core.py b/superset/views/core.py index c67410ad0ec85..54d0a0684633e 100755 --- a/superset/views/core.py +++ b/superset/views/core.py @@ -751,7 +751,7 @@ def shortner(self): scheme = request.scheme return Response( '{scheme}://{request.headers[Host]}/{directory}?r={obj.id}'.format( - scheme=scheme, request=request, directory=directory, obj=obj), + scheme=scheme, request=request, directory=directory, obj=obj), mimetype='text/plain') @expose('/msg/') From b28090dd0c4d8ee69dbc5ce4a9744528268c251a Mon Sep 17 00:00:00 2001 From: LE BRIS Jules Date: Thu, 26 Apr 2018 18:37:11 +0200 Subject: [PATCH 4/4] remove temp var --- superset/views/core.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/superset/views/core.py b/superset/views/core.py index 54d0a0684633e..b60d91c485ca7 100755 --- a/superset/views/core.py +++ b/superset/views/core.py @@ -748,10 +748,9 @@ def shortner(self): obj = models.Url(url=url) db.session.add(obj) db.session.commit() - scheme = request.scheme return Response( '{scheme}://{request.headers[Host]}/{directory}?r={obj.id}'.format( - scheme=scheme, request=request, directory=directory, obj=obj), + scheme=request.scheme, request=request, directory=directory, obj=obj), mimetype='text/plain') @expose('/msg/')