Skip to content

Migrations and adaptation to django 1.11 #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SarunasAzna wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Migrations and adaptation to django 1.11 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f21e16b
remove old url definition
SarunasAzna Jul 4, 2017
e3426b9
initial migrations
SarunasAzna Jul 4, 2017
258fef8
names to urls
SarunasAzna Jul 4, 2017
d34055b
fix urls
SarunasAzna Jul 4, 2017
7280a31
lint
SarunasAzna Jul 4, 2017
08d04cc
Update README.rst
SarunasAzna Jul 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Configuration
If the configuration is put inside the project's ``urls.py``, the log in
URL will look like the following::

http://example.com/loginurl/a-secret-key
http://example.com/loginurl/login/a-secret-key


Scheduled Task
Expand Down Expand Up @@ -83,7 +83,7 @@ property called ``key`` that contains a unique key for the log in URL.
import loginurl.utils

def create_login_url(user):
key = loginurl.utils.create(user)
key = utils.create(user)
url = 'http://example.com/loginurl/%s' % key.key

return url
Expand Down
31 changes: 31 additions & 0 deletions loginurl/migrations/0001_initial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.1 on 2017-07-04 12:29
from __future__ import unicode_literals

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

initial = True

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]

operations = [
migrations.CreateModel(
name='Key',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('key', models.CharField(blank=True, max_length=40, unique=True)),
('created', models.DateTimeField(auto_now_add=True)),
('usage_left', models.IntegerField(blank=True, default=1, null=True)),
('expires', models.DateTimeField(blank=True, null=True)),
('next', models.CharField(blank=True, max_length=200, null=True)),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
]
Empty file added loginurl/migrations/__init__.py
View file
Open in desktop
Empty file.
18 changes: 10 additions & 8 deletions loginurl/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
from django.conf.urls import patterns, url
from django.conf.urls import url
from django.views.generic import RedirectView
from django.conf import settings

from loginurl.views import cleanup, login

urlpatterns = patterns('',
(r'^cleanup/$', cleanup),
(r'^(?P<key>[0-9A-Za-z]+-[a-z0-9-]+)/$', login),
url(r'^$', name='loginurl-index', view=RedirectView.as_view(
urlpatterns = [
url(r'^cleanup/$', cleanup, name='loginurl-cleanup'),
url(r'^login/(?P<key>[0-9A-Za-z]+-[a-z0-9-]+)/$', login,
name='loginurl-login'),
url(r'^$', RedirectView.as_view(
permanent=True,
url=settings.LOGIN_URL,
)),
)
url=settings.LOGIN_URL),
name='loginurl-index'
),
]