Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'ticket-testing' into 'master'

Browse source 
Py3 compatibility

See merge request LCA2018/symposion_app!32
This commit is contained in:
James Polley 2017-09-17 12:42:23 +00:00
commit d5054456e7
2 changed files with 430 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

457
fixtures/sitetree.json
View file

@ -1,56 +1,455 @@
[ [
{ {
"pk": 1,
"model": "sitetree.tree",
"fields": { "fields": {
"alias": "main", "alias": "main",
"title": "main" "title": "main"
} },
"model": "sitetree.tree",
"pk": 1
}, },
{ {
"pk": 1,
"model": "sitetree.treeitem",
"fields": { "fields": {
"parent": null, "access_guest": false,
"access_restricted": false, "access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [], "access_permissions": [],
"access_restricted": false,
"alias": null,
"description": "", "description": "",
"insitetree": true, "hidden": false,
"hint": "", "hint": "",
"url": "http://lca2018.org",
"inbreadcrumbs": true, "inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": null,
"sort_order": 2,
"title": "LINUX.CONF.AU 2018", "title": "LINUX.CONF.AU 2018",
"tree": 1, "tree": 1,
"access_perm_type": 1, "url": "http://lca2018.org",
"alias": null,
"sort_order": 2,
"inmenu": true,
"access_loggedin": false,
"hidden": false,
"urlaspattern": false "urlaspattern": false
} },
"model": "sitetree.treeitem",
"pk": 1
}, },
{ {
"pk": 2,
"model": "sitetree.treeitem",
"fields": { "fields": {
"parent": null, "access_guest": false,
"access_restricted": false, "access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [], "access_permissions": [],
"access_restricted": false,
"alias": null,
"description": "", "description": "",
"insitetree": true, "hidden": false,
"hint": "", "hint": "",
"url": "dashboard",
"inbreadcrumbs": true, "inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": null,
"sort_order": 3,
"title": "Dashboard", "title": "Dashboard",
"tree": 1, "tree": 1,
"access_perm_type": 1, "url": "dashboard",
"alias": null,
"sort_order": 3,
"inmenu": true,
"access_loggedin": false,
"hidden": false,
"urlaspattern": true "urlaspattern": true
} },
"model": "sitetree.treeitem",
"pk": 2
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [
52
],
"access_restricted": true,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 9,
"sort_order": 3,
"title": "django admin",
"tree": 1,
"url": "/admin",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 3
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [
52
],
"access_restricted": true,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 9,
"sort_order": 4,
"title": "Ticket Reports",
"tree": 1,
"url": "/tickets/reports/",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 4
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [
53
],
"access_restricted": true,
"alias": null,
"description": "",
"hidden": false,
"hint": "change main to miniconf if needed",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 10,
"sort_order": 7,
"title": "Bulk Update",
"tree": 1,
"url": "/reviews/section/main/admin/accept",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 7
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [
53
],
"access_restricted": true,
"alias": null,
"description": "",
"hidden": false,
"hint": "change main to miniconf if needed",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 10,
"sort_order": 8,
"title": "Notifications",
"tree": 1,
"url": "/reviews/section/main/notification/accepted/",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 8
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [
20,
52
],
"access_restricted": true,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": null,
"sort_order": 9,
"title": "Admin",
"tree": 1,
"url": "#",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 9
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [
288,
287,
52,
53,
55,
56
],
"access_restricted": true,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": null,
"sort_order": 10,
"title": "Talks",
"tree": 1,
"url": "#",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 10
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [
290,
289
],
"access_restricted": true,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": null,
"sort_order": 11,
"title": "Miniconf",
"tree": 1,
"url": "#",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 11
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [],
"access_restricted": false,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 11,
"sort_order": 12,
"title": "Bulk Update",
"tree": 1,
"url": "/reviews/section/miniconf/admin/accept",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 12
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [],
"access_restricted": false,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 11,
"sort_order": 13,
"title": "Notifications",
"tree": 1,
"url": "/reviews/section/miniconf/notification/accepted/",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 13
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [
287
],
"access_restricted": true,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 10,
"sort_order": 14,
"title": "Review Admin",
"tree": 1,
"url": "/reviews/section/main/admin/",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 14
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [
287
],
"access_restricted": true,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 10,
"sort_order": 15,
"title": "Voting Status",
"tree": 1,
"url": "/reviews/section/main/status/",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 15
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [
289
],
"access_restricted": true,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 11,
"sort_order": 17,
"title": "Voting Status",
"tree": 1,
"url": "/reviews/section/miniconf/status/",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 16
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [
289
],
"access_restricted": true,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 11,
"sort_order": 16,
"title": "Review Admin",
"tree": 1,
"url": "/reviews/section/miniconf/admin/",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 17
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [
106,
107,
108
],
"access_restricted": true,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": null,
"sort_order": 18,
"title": "Schedule Admin",
"tree": 1,
"url": "#",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 18
},
{
"fields": {
"access_guest": false,
"access_loggedin": false,
"access_perm_type": 1,
"access_permissions": [
106,
107,
108
],
"access_restricted": true,
"alias": null,
"description": "",
"hidden": false,
"hint": "",
"inbreadcrumbs": true,
"inmenu": true,
"insitetree": true,
"parent": 18,
"sort_order": 19,
"title": "Edit",
"tree": 1,
"url": "/schedule/edit",
"urlaspattern": false
},
"model": "sitetree.treeitem",
"pk": 19
} }
] ]

4
vendor/symposion/schedule/timetable.py vendored
View file

@ -47,5 +47,5 @@ class TimeTable(object):
def pairwise(iterable): def pairwise(iterable):
a, b = itertools.tee(iterable) a, b = itertools.tee(iterable)
b.next() next(b)
return itertools.izip_longest(a, b) return itertools.zip_longest(a, b)