From 439b8a8e1f6cd7d4669de5d3603d45e9be4c811e Mon Sep 17 00:00:00 2001 From: mcd-php Date: Wed, 13 Apr 2016 15:03:44 +0400 Subject: [PATCH 1/7] FIX: In AJAX popup, widget was not working --- django_ulogin/templates/django_ulogin/ulogin_widget.html | 1 + 1 file changed, 1 insertion(+) diff --git a/django_ulogin/templates/django_ulogin/ulogin_widget.html b/django_ulogin/templates/django_ulogin/ulogin_widget.html index a4a9a0c..a59323c 100644 --- a/django_ulogin/templates/django_ulogin/ulogin_widget.html +++ b/django_ulogin/templates/django_ulogin/ulogin_widget.html @@ -14,5 +14,6 @@ {% else %}
{% endif %} + {% endif %} {% endspaceless %} From 4637eb2e12a6770e415a426a5b12daa88425d591 Mon Sep 17 00:00:00 2001 From: mcd-php Date: Wed, 13 Apr 2016 15:06:47 +0300 Subject: [PATCH 2/7] RE-FIX: uLogin not defined in AJAX ... .. after first load --- django_ulogin/templates/django_ulogin/ulogin_media.html | 2 +- django_ulogin/templates/django_ulogin/ulogin_widget.html | 3 +-- django_ulogin/templatetags/ulogin_tags.py | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/django_ulogin/templates/django_ulogin/ulogin_media.html b/django_ulogin/templates/django_ulogin/ulogin_media.html index 432a1aa..9aeb0b6 100644 --- a/django_ulogin/templates/django_ulogin/ulogin_media.html +++ b/django_ulogin/templates/django_ulogin/ulogin_media.html @@ -1 +1 @@ - \ No newline at end of file + diff --git a/django_ulogin/templates/django_ulogin/ulogin_widget.html b/django_ulogin/templates/django_ulogin/ulogin_widget.html index a59323c..7baa11f 100644 --- a/django_ulogin/templates/django_ulogin/ulogin_widget.html +++ b/django_ulogin/templates/django_ulogin/ulogin_widget.html @@ -5,7 +5,7 @@ {% if SCHEME_NOT_FOUND %}
[ulogin]: scheme {{ NAME }} not found
{% else %} - {% ulogin_media %} + {% ulogin_media RAND %} {% if DISPLAY == 'button' %} @@ -14,6 +14,5 @@ {% else %}
{% endif %} - {% endif %} {% endspaceless %} diff --git a/django_ulogin/templatetags/ulogin_tags.py b/django_ulogin/templatetags/ulogin_tags.py index ae31d17..ed30db2 100644 --- a/django_ulogin/templatetags/ulogin_tags.py +++ b/django_ulogin/templatetags/ulogin_tags.py @@ -72,9 +72,10 @@ def ulogin_widget(context, name="default"): takes_context=True)(ulogin_widget) -def ulogin_media(context): +def ulogin_media(context,rand=None): return { 'WIDGET_URL': s.WIDGET_URL, + 'RAND': rand } register.inclusion_tag('django_ulogin/ulogin_media.html', takes_context=True)(ulogin_media) From 1cf0d9c01af4670bdfa7c0ee2768056c8488dda1 Mon Sep 17 00:00:00 2001 From: mcd-php Date: Wed, 13 Apr 2016 15:38:38 +0300 Subject: [PATCH 3/7] RE-FIX: Failed non-first time in AJAX --- django_ulogin/templates/django_ulogin/ulogin_widget.html | 1 + 1 file changed, 1 insertion(+) diff --git a/django_ulogin/templates/django_ulogin/ulogin_widget.html b/django_ulogin/templates/django_ulogin/ulogin_widget.html index 7baa11f..0e0ac4d 100644 --- a/django_ulogin/templates/django_ulogin/ulogin_widget.html +++ b/django_ulogin/templates/django_ulogin/ulogin_widget.html @@ -14,5 +14,6 @@ {% else %}
{% endif %} + {% endif %} {% endspaceless %} From 1f05c29dd20670b0184166d5b79fe856055700e1 Mon Sep 17 00:00:00 2001 From: mcd-php Date: Thu, 14 Apr 2016 10:23:06 +0300 Subject: [PATCH 4/7] PEP8: Line length --- django_ulogin/views.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/django_ulogin/views.py b/django_ulogin/views.py index 7415836..1dd8de3 100644 --- a/django_ulogin/views.py +++ b/django_ulogin/views.py @@ -150,7 +150,13 @@ def ulogin_response(self, token, host): """ Makes a request to ULOGIN """ - response = requests.get(settings.TOKEN_URL, params={'token': token, 'host': host}) + response = requests.get( + settings.TOKEN_URL, + params={ + 'token': token, + 'host': host + } + ) content = response.content if sys.version_info >= (3,0): From 615100f0a2d12cfa251811c3274f4b8e99cb9778 Mon Sep 17 00:00:00 2001 From: mcd-php Date: Thu, 14 Apr 2016 10:24:19 +0300 Subject: [PATCH 5/7] PEP8: def, not lambda --- django_ulogin/templatetags/ulogin_tags.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/django_ulogin/templatetags/ulogin_tags.py b/django_ulogin/templatetags/ulogin_tags.py index ed30db2..9ce12e9 100644 --- a/django_ulogin/templatetags/ulogin_tags.py +++ b/django_ulogin/templatetags/ulogin_tags.py @@ -50,7 +50,10 @@ def ulogin_widget(context, name="default"): 'SCHEME_NOT_FOUND': True, 'NAME': name } - glue = lambda key: ','.join([p for p in scheme.get(key, getattr(s, key))]) + + def glue(key): + return ','.join([p for p in scheme.get(key, getattr(s, key))]) + rand = ''.join(random.choice(string.ascii_lowercase) for x in range(5)) return { From ba53a0e02bf4f5dc3fa13c2b6b483cc6b3bbd94d Mon Sep 17 00:00:00 2001 From: mcd-php Date: Thu, 14 Apr 2016 10:43:08 +0300 Subject: [PATCH 6/7] PEP8: space before comma --- django_ulogin/templatetags/ulogin_tags.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_ulogin/templatetags/ulogin_tags.py b/django_ulogin/templatetags/ulogin_tags.py index 9ce12e9..09e580c 100644 --- a/django_ulogin/templatetags/ulogin_tags.py +++ b/django_ulogin/templatetags/ulogin_tags.py @@ -75,7 +75,7 @@ def glue(key): takes_context=True)(ulogin_widget) -def ulogin_media(context,rand=None): +def ulogin_media(context, rand=None): return { 'WIDGET_URL': s.WIDGET_URL, 'RAND': rand From 73190e9ec11b4c0e74e0c3248ca885f005d6209e Mon Sep 17 00:00:00 2001 From: mcd-php Date: Thu, 14 Apr 2016 10:48:36 +0300 Subject: [PATCH 7/7] PEP8: space before comma --- django_ulogin/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_ulogin/views.py b/django_ulogin/views.py index 1dd8de3..f6ffac1 100644 --- a/django_ulogin/views.py +++ b/django_ulogin/views.py @@ -159,7 +159,7 @@ def ulogin_response(self, token, host): ) content = response.content - if sys.version_info >= (3,0): + if sys.version_info >= (3, 0): content = content.decode('utf8') return json.loads(content)