Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Django 1.9 compatibility
- Remove deprecated `load ur from future` - Refactor urls.py as list
- Loading branch information
Showing
10 changed files
with
21 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,3 @@ | ||
{% load url from future %} | ||
A new task comment has been added. | ||
|
||
Task: {{ task.title }} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
{% extends "todo/base.html" %} | ||
{% load url from future %} | ||
|
||
{% block title %}Task: {{ task.title }}{% endblock %} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,23 @@ | ||
from django.conf.urls import patterns, url | ||
from django.conf.urls import url | ||
from todo import views | ||
|
||
urlpatterns = patterns( | ||
'', | ||
url(r'^$', 'todo.views.list_lists', name="todo-lists"), | ||
url(r'^mine/$', 'todo.views.view_list', {'list_slug': 'mine'}, name="todo-mine"), | ||
url(r'^(?P<list_id>\d{1,4})/(?P<list_slug>[\w-]+)/delete$', 'todo.views.del_list', name="todo-del_list"), | ||
url(r'^task/(?P<task_id>\d{1,6})$', 'todo.views.view_task', name='todo-task_detail'), | ||
url(r'^(?P<list_id>\d{1,4})/(?P<list_slug>[\w-]+)$', 'todo.views.view_list', name='todo-incomplete_tasks'), | ||
url(r'^(?P<list_id>\d{1,4})/(?P<list_slug>[\w-]+)/completed$', 'todo.views.view_list', {'view_completed': 1}, | ||
urlpatterns = [ | ||
url(r'^$', views.list_lists, name="todo-lists"), | ||
url(r'^mine/$', views.view_list, {'list_slug': 'mine'}, name="todo-mine"), | ||
url(r'^(?P<list_id>\d{1,4})/(?P<list_slug>[\w-]+)/delete$', views.del_list, name="todo-del_list"), | ||
url(r'^task/(?P<task_id>\d{1,6})$', views.view_task, name='todo-task_detail'), | ||
url(r'^(?P<list_id>\d{1,4})/(?P<list_slug>[\w-]+)$', views.view_list, name='todo-incomplete_tasks'), | ||
url(r'^(?P<list_id>\d{1,4})/(?P<list_slug>[\w-]+)/completed$', views.view_list, {'view_completed': 1}, | ||
name='todo-completed_tasks'), | ||
url(r'^add_list/$', 'todo.views.add_list', name="todo-add_list"), | ||
url(r'^search-post/$', 'todo.views.search_post', name="todo-search-post"), | ||
url(r'^search/$', 'todo.views.search', name="todo-search"), | ||
url(r'^add_list/$', views.add_list, name="todo-add_list"), | ||
url(r'^search-post/$', views.search_post, name="todo-search-post"), | ||
url(r'^search/$', views.search, name="todo-search"), | ||
|
||
# View reorder_tasks is only called by JQuery for drag/drop task ordering | ||
url(r'^reorder_tasks/$', 'todo.views.reorder_tasks', name="todo-reorder_tasks"), | ||
url(r'^reorder_tasks/$', views.reorder_tasks, name="todo-reorder_tasks"), | ||
|
||
url(r'^ticket/add/$', 'todo.views.external_add', name="todo-external-add"), | ||
url(r'^recent/added/$', 'todo.views.view_list', {'list_slug': 'recent-add'}, name="todo-recently_added"), | ||
url(r'^recent/completed/$', 'todo.views.view_list', {'list_slug': 'recent-complete'}, | ||
url(r'^ticket/add/$', views.external_add, name="todo-external-add"), | ||
url(r'^recent/added/$', views.view_list, {'list_slug': 'recent-add'}, name="todo-recently_added"), | ||
url(r'^recent/completed/$', views.view_list, {'list_slug': 'recent-complete'}, | ||
name="todo-recently_completed"), | ||
) | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters