diff options
| author | jelle van der Waa <jelle@vdwaa.nl> | 2018-10-20 16:01:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-20 16:01:43 +0200 |
| commit | c522212d791024c0e9036ba5c999c865dd14f6e6 (patch) | |
| tree | 55782f7bd3e4caa135964c5724753d4461db5154 | |
| parent | 73759c31fb069e406f976ed425c7c47043e8b914 (diff) | |
| parent | 2c044ad13078bd99f2a6d90fd74a926ff1e61e5d (diff) | |
| download | archweb-c522212d791024c0e9036ba5c999c865dd14f6e6.tar.gz archweb-c522212d791024c0e9036ba5c999c865dd14f6e6.zip | |
Merge pull request #144 from jelly/todolist_old_id
todolists: remove old_id from todolist model
| -rw-r--r-- | todolists/models.py | 1 | ||||
| -rw-r--r-- | todolists/urls.py | 5 | ||||
| -rw-r--r-- | todolists/views.py | 5 |
3 files changed, 1 insertions, 10 deletions
diff --git a/todolists/models.py b/todolists/models.py index a1b82d9b..c22017bf 100644 --- a/todolists/models.py +++ b/todolists/models.py @@ -9,7 +9,6 @@ from main.utils import set_created_field class Todolist(models.Model): slug = models.SlugField(max_length=255, unique=True) - old_id = models.IntegerField(null=True, unique=True) name = models.CharField(max_length=255) description = models.TextField() creator = models.ForeignKey(User, on_delete=models.PROTECT, diff --git a/todolists/urls.py b/todolists/urls.py index 37a8420c..91f3712f 100644 --- a/todolists/urls.py +++ b/todolists/urls.py @@ -1,15 +1,12 @@ from django.conf.urls import url from django.contrib.auth.decorators import permission_required -from .views import (view_redirect, view, view_json, add, edit, flag, +from .views import (view, view_json, add, edit, flag, list_pkgbases, DeleteTodolist, TodolistListView) urlpatterns = [ url(r'^$', TodolistListView.as_view(), name='todolist-list'), - # old todolists URLs, permanent redirect view so we don't break all links - url(r'^(?P<old_id>\d+)/$', view_redirect), - url(r'^add/$', permission_required('todolists.add_todolist')(add)), url(r'^(?P<slug>[-\w]+)/$', view), diff --git a/todolists/views.py b/todolists/views.py index cf84f156..85539b7f 100644 --- a/todolists/views.py +++ b/todolists/views.py @@ -57,11 +57,6 @@ def flag(request, slug, pkg_id): return redirect(todolist) -def view_redirect(request, old_id): - todolist = get_object_or_404(Todolist, old_id=old_id) - return redirect(todolist, permanent=True) - - def view(request, slug): todolist = get_object_or_404(Todolist, slug=slug) svn_roots = Repo.objects.values_list( |