diff --git a/data/sitetree_new.json b/data/sitetree_new.json
index 6fb2b7f4..f6a2e82b 100644
--- a/data/sitetree_new.json
+++ b/data/sitetree_new.json
@@ -1,816 +1,782 @@
[
- {
- "model": "sitetree.tree",
- "pk": 1,
- "fields": {
- "title": "Hlavní menu",
- "alias": "main_menu"
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 1,
- "fields": {
- "title": "Co je M&M",
- "hint": "",
- "url": "/co-je-MaM/uvod/",
- "urlaspattern": false,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": null,
- "sort_order": 1,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 2,
- "fields": {
- "title": "Jak řešit",
- "hint": "",
- "url": "/jak-resit/",
- "urlaspattern": false,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": null,
- "sort_order": 2,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 3,
- "fields": {
- "title": "Aktuální
ročník",
- "hint": "",
- "url": "seminar_aktualni_zadani",
- "urlaspattern": true,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": null,
- "sort_order": 3,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 4,
- "fields": {
- "title": "Soustředění",
- "hint": "",
- "url": "/soustredeni/",
- "urlaspattern": false,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": null,
- "sort_order": 4,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 5,
- "fields": {
- "title": "Archiv",
- "hint": "",
- "url": "seminar_archiv_rocniky",
- "urlaspattern": true,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": null,
- "sort_order": 5,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 6,
- "fields": {
- "title": "Přihlásit",
- "hint": "",
- "url": "login",
- "urlaspattern": true,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": true,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": null,
- "sort_order": 6,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 7,
- "fields": {
- "title": "Úvod",
- "hint": "",
- "url": "/co-je-MaM/uvod/",
- "urlaspattern": false,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": 1,
- "sort_order": 7,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 8,
- "fields": {
- "title": "Organizátoři",
- "hint": "",
- "url": "organizatori",
- "urlaspattern": true,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": 1,
- "sort_order": 8,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 9,
- "fields": {
- "title": "FAQ",
- "hint": "",
- "url": "/co-je-MaM/FAQ/",
- "urlaspattern": false,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": 1,
- "sort_order": 9,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 10,
- "fields": {
- "title": "Kontakt",
- "hint": "",
- "url": "/co-je-MaM/kontakt/",
- "urlaspattern": false,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": 1,
- "sort_order": 10,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 11,
- "fields": {
- "title": "Témata",
- "hint": "",
- "url": "/jak-resit/",
- "urlaspattern": false,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": 2,
- "sort_order": 11,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 12,
- "fields": {
- "title": "Jak psát příspěvek",
- "hint": "",
- "url": "/jak-resit/jak-psat-prispevek/",
- "urlaspattern": false,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": 2,
- "sort_order": 12,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 13,
- "fields": {
- "title": "Odměny",
- "hint": "",
- "url": "/co-je-MaM/odmeny/",
- "urlaspattern": false,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": 2,
- "sort_order": 13,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 16,
- "fields": {
- "title": "Výsledková listina",
- "hint": "",
- "url": "zadani/vysledkova-listina/",
- "urlaspattern": false,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": 3,
- "sort_order": 33,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 17,
- "fields": {
- "title": "Články",
- "hint": "",
- "url": "clanky_resitel",
- "urlaspattern": true,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": 3,
- "sort_order": 34,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 18,
- "fields": {
- "title": "Úvod",
- "hint": "",
- "url": "/soustredeni/",
- "urlaspattern": false,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": 4,
- "sort_order": 18,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 19,
- "fields": {
- "title": "Připravujeme",
- "hint": "",
- "url": "/soustredeni/pripravujeme/",
- "urlaspattern": false,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": 4,
- "sort_order": 19,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 20,
- "fields": {
- "title": "Proběhlo",
- "hint": "",
- "url": "seminar_seznam_soustredeni",
- "urlaspattern": true,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": 4,
- "sort_order": 20,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 21,
- "fields": {
- "title": "Profil",
- "hint": "",
- "url": "profil",
- "urlaspattern": true,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": true,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": null,
- "sort_order": 21,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 22,
- "fields": {
- "title": "Osobní údaje",
- "hint": "",
- "url": "seminar_resitel_edit",
- "urlaspattern": true,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": 21,
- "sort_order": 23,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 23,
- "fields": {
- "title": "Poslat řešení",
- "hint": "",
- "url": "seminar_nahraj_reseni",
- "urlaspattern": true,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": 21,
- "sort_order": 36,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 24,
- "fields": {
- "title": "Témata",
- "hint": "",
- "url": "seminar_temata",
- "urlaspattern": true,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": 5,
- "sort_order": 35,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 28,
- "fields": {
- "title": "HIDDEN",
- "hint": "",
- "url": "/korektury/",
- "urlaspattern": false,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": true,
- "access_perm_type": 1,
- "parent": null,
- "sort_order": 28,
- "access_permissions": [
- 1
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 30,
- "fields": {
- "title": "Aktuální",
- "hint": "",
- "url": "korektury_list",
- "urlaspattern": true,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": 28,
- "sort_order": 30,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 31,
- "fields": {
- "title": "Zastaralé",
- "hint": "",
- "url": "korektury_stare_list",
- "urlaspattern": true,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": 28,
- "sort_order": 31,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 32,
- "fields": {
- "title": "Nápověda",
- "hint": "",
- "url": "/korektury/help/",
- "urlaspattern": false,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": 28,
- "sort_order": 32,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 33,
- "fields": {
- "title": "Aktuální číslo",
- "hint": "",
- "url": "seminar_aktualni_zadani",
- "urlaspattern": true,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": 3,
- "sort_order": 15,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 34,
- "fields": {
- "title": "Témata",
- "hint": "",
- "url": "seminar_temata",
- "urlaspattern": true,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": 3,
- "sort_order": 17,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 35,
- "fields": {
- "title": "Čísla",
- "hint": "",
- "url": "seminar_archiv_rocniky",
- "urlaspattern": true,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": 5,
- "sort_order": 24,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 36,
- "fields": {
- "title": "Úvod",
- "hint": "",
- "url": "profil",
- "urlaspattern": true,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": false,
- "access_perm_type": 1,
- "parent": 21,
- "sort_order": 22,
- "access_permissions": [
-
- ]
- }
- },
- {
- "model": "sitetree.treeitem",
- "pk": 37,
- "fields": {
- "title": "Odevzdaná řešení",
- "hint": "",
- "url": "odevzdavatko_tabulka",
- "urlaspattern": true,
- "tree": 1,
- "hidden": false,
- "alias": null,
- "description": "",
- "inmenu": true,
- "inbreadcrumbs": true,
- "insitetree": true,
- "access_loggedin": false,
- "access_guest": false,
- "access_restricted": true,
- "access_perm_type": 1,
- "parent": 21,
- "sort_order": 37,
- "access_permissions": [
- 1
- ]
- }
- }
+ {
+ "model":"sitetree.tree",
+ "fields":{
+ "title":"Hlavní menu",
+ "alias":"main_menu"
+ },
+ "pk":1
+ },
+ {
+ "pk":1,
+ "fields":{
+ "parent":null,
+ "insitetree":true,
+ "tree":1,
+ "description":"",
+ "urlaspattern":false,
+ "title":"Co je M&M",
+ "access_guest":false,
+ "alias":null,
+ "url":"/co-je-MaM/uvod/",
+ "inmenu":true,
+ "access_perm_type":1,
+ "access_permissions":[],
+ "hint":"",
+ "sort_order":1,
+ "access_loggedin":false,
+ "inbreadcrumbs":true,
+ "access_restricted":false,
+ "hidden":false
+ },
+ "model":"sitetree.treeitem"
+ },
+ {
+ "pk":2,
+ "fields":{
+ "access_permissions":[],
+ "access_perm_type":1,
+ "url":"/jak-resit/",
+ "inmenu":true,
+ "alias":null,
+ "hint":"",
+ "access_loggedin":false,
+ "sort_order":2,
+ "hidden":false,
+ "access_restricted":false,
+ "inbreadcrumbs":true,
+ "parent":null,
+ "tree":1,
+ "insitetree":true,
+ "access_guest":false,
+ "title":"Jak řešit",
+ "urlaspattern":false,
+ "description":""
+ },
+ "model":"sitetree.treeitem"
+ },
+ {
+ "pk":3,
+ "fields":{
+ "access_loggedin":false,
+ "sort_order":3,
+ "access_restricted":false,
+ "hidden":false,
+ "inbreadcrumbs":true,
+ "inmenu":true,
+ "url":"/zadani/aktualni/",
+ "access_permissions":[],
+ "access_perm_type":1,
+ "alias":null,
+ "hint":"",
+ "insitetree":true,
+ "tree":1,
+ "urlaspattern":false,
+ "title":"Aktuální
ročník",
+ "access_guest":false,
+ "description":"",
+ "parent":null
+ },
+ "model":"sitetree.treeitem"
+ },
+ {
+ "fields":{
+ "hint":"",
+ "alias":null,
+ "access_perm_type":1,
+ "access_permissions":[],
+ "inmenu":true,
+ "url":"/soustredeni/",
+ "inbreadcrumbs":true,
+ "hidden":false,
+ "access_restricted":false,
+ "access_loggedin":false,
+ "sort_order":4,
+ "parent":null,
+ "description":"",
+ "access_guest":false,
+ "title":"Soustředění",
+ "urlaspattern":false,
+ "tree":1,
+ "insitetree":true
+ },
+ "model":"sitetree.treeitem",
+ "pk":4
+ },
+ {
+ "model":"sitetree.treeitem",
+ "fields":{
+ "parent":null,
+ "insitetree":true,
+ "tree":1,
+ "description":"",
+ "urlaspattern":false,
+ "title":"Archiv",
+ "access_guest":false,
+ "alias":null,
+ "inmenu":true,
+ "url":"/archiv/rocniky/",
+ "access_permissions":[],
+ "access_perm_type":1,
+ "hint":"",
+ "sort_order":5,
+ "access_loggedin":false,
+ "inbreadcrumbs":true,
+ "access_restricted":false,
+ "hidden":false
+ },
+ "pk":5
+ },
+ {
+ "model":"sitetree.treeitem",
+ "fields":{
+ "insitetree":true,
+ "tree":1,
+ "urlaspattern":false,
+ "access_guest":true,
+ "title":"Přihlásit",
+ "description":"",
+ "parent":null,
+ "sort_order":6,
+ "access_loggedin":false,
+ "access_restricted":false,
+ "hidden":false,
+ "inbreadcrumbs":true,
+ "inmenu":true,
+ "url":"/login/",
+ "access_perm_type":1,
+ "access_permissions":[],
+ "alias":null,
+ "hint":""
+ },
+ "pk":6
+ },
+ {
+ "model":"sitetree.treeitem",
+ "fields":{
+ "insitetree":true,
+ "tree":1,
+ "description":"",
+ "urlaspattern":false,
+ "access_guest":false,
+ "title":"Úvod",
+ "parent":1,
+ "access_loggedin":false,
+ "sort_order":7,
+ "inbreadcrumbs":true,
+ "access_restricted":false,
+ "hidden":false,
+ "alias":null,
+ "inmenu":true,
+ "url":"/co-je-MaM/uvod/",
+ "access_permissions":[],
+ "access_perm_type":1,
+ "hint":""
+ },
+ "pk":7
+ },
+ {
+ "model":"sitetree.treeitem",
+ "fields":{
+ "parent":1,
+ "description":"",
+ "urlaspattern":false,
+ "title":"Organizátoři",
+ "access_guest":false,
+ "insitetree":true,
+ "tree":1,
+ "hint":"",
+ "alias":null,
+ "url":"/co-je-MaM/organizatori/",
+ "inmenu":true,
+ "access_permissions":[],
+ "access_perm_type":1,
+ "inbreadcrumbs":true,
+ "access_restricted":false,
+ "hidden":false,
+ "access_loggedin":false,
+ "sort_order":8
+ },
+ "pk":8
+ },
+ {
+ "model":"sitetree.treeitem",
+ "fields":{
+ "parent":1,
+ "tree":1,
+ "insitetree":true,
+ "description":"",
+ "title":"FAQ",
+ "access_guest":false,
+ "urlaspattern":false,
+ "alias":null,
+ "access_perm_type":1,
+ "access_permissions":[],
+ "url":"/co-je-MaM/FAQ/",
+ "inmenu":true,
+ "hint":"",
+ "access_loggedin":false,
+ "sort_order":9,
+ "inbreadcrumbs":true,
+ "hidden":false,
+ "access_restricted":false
+ },
+ "pk":9
+ },
+ {
+ "pk":10,
+ "fields":{
+ "urlaspattern":false,
+ "title":"Kontakt",
+ "access_guest":false,
+ "description":"",
+ "insitetree":true,
+ "tree":1,
+ "parent":1,
+ "access_restricted":false,
+ "hidden":false,
+ "inbreadcrumbs":true,
+ "access_loggedin":false,
+ "sort_order":10,
+ "hint":"",
+ "inmenu":true,
+ "url":"/co-je-MaM/kontakt/",
+ "access_perm_type":1,
+ "access_permissions":[],
+ "alias":null
+ },
+ "model":"sitetree.treeitem"
+ },
+ {
+ "model":"sitetree.treeitem",
+ "fields":{
+ "urlaspattern":false,
+ "access_guest":false,
+ "title":"Témata",
+ "description":"",
+ "insitetree":true,
+ "tree":1,
+ "parent":2,
+ "access_restricted":false,
+ "hidden":false,
+ "inbreadcrumbs":true,
+ "sort_order":11,
+ "access_loggedin":false,
+ "hint":"",
+ "inmenu":true,
+ "url":"/jak-resit/",
+ "access_permissions":[],
+ "access_perm_type":1,
+ "alias":null
+ },
+ "pk":11
+ },
+ {
+ "pk":12,
+ "model":"sitetree.treeitem",
+ "fields":{
+ "hidden":false,
+ "access_restricted":false,
+ "inbreadcrumbs":true,
+ "sort_order":12,
+ "access_loggedin":false,
+ "hint":"",
+ "access_permissions":[],
+ "access_perm_type":1,
+ "inmenu":true,
+ "url":"/jak-resit/jak-psat-prispevek/",
+ "alias":null,
+ "access_guest":false,
+ "title":"Jak psát příspěvek",
+ "urlaspattern":false,
+ "description":"",
+ "tree":1,
+ "insitetree":true,
+ "parent":2
+ }
+ },
+ {
+ "model":"sitetree.treeitem",
+ "fields":{
+ "hint":"",
+ "access_permissions":[],
+ "access_perm_type":1,
+ "inmenu":true,
+ "url":"/co-je-MaM/odmeny/",
+ "alias":null,
+ "hidden":false,
+ "access_restricted":false,
+ "inbreadcrumbs":true,
+ "access_loggedin":false,
+ "sort_order":13,
+ "parent":2,
+ "access_guest":false,
+ "title":"Odměny",
+ "urlaspattern":false,
+ "description":"",
+ "tree":1,
+ "insitetree":true
+ },
+ "pk":13
+ },
+ {
+ "pk":16,
+ "fields":{
+ "tree":1,
+ "insitetree":true,
+ "access_guest":false,
+ "title":"Výsledková listina",
+ "urlaspattern":false,
+ "description":"",
+ "parent":3,
+ "access_loggedin":false,
+ "sort_order":33,
+ "hidden":false,
+ "access_restricted":false,
+ "inbreadcrumbs":true,
+ "access_perm_type":1,
+ "access_permissions":[],
+ "url":"zadani/vysledkova-listina/",
+ "inmenu":true,
+ "alias":null,
+ "hint":""
+ },
+ "model":"sitetree.treeitem"
+ },
+ {
+ "fields":{
+ "title":"Články",
+ "access_guest":false,
+ "urlaspattern":false,
+ "description":"",
+ "tree":1,
+ "insitetree":true,
+ "parent":3,
+ "hidden":false,
+ "access_restricted":false,
+ "inbreadcrumbs":true,
+ "sort_order":34,
+ "access_loggedin":false,
+ "hint":"",
+ "access_perm_type":1,
+ "access_permissions":[],
+ "inmenu":true,
+ "url":"/clanky/resitel/",
+ "alias":null
+ },
+ "model":"sitetree.treeitem",
+ "pk":17
+ },
+ {
+ "pk":18,
+ "model":"sitetree.treeitem",
+ "fields":{
+ "tree":1,
+ "insitetree":true,
+ "description":"",
+ "access_guest":false,
+ "title":"Úvod",
+ "urlaspattern":false,
+ "parent":4,
+ "access_loggedin":false,
+ "sort_order":18,
+ "inbreadcrumbs":true,
+ "hidden":false,
+ "access_restricted":false,
+ "alias":null,
+ "access_permissions":[],
+ "access_perm_type":1,
+ "url":"/soustredeni/",
+ "inmenu":true,
+ "hint":""
+ }
+ },
+ {
+ "fields":{
+ "sort_order":19,
+ "access_loggedin":false,
+ "inbreadcrumbs":true,
+ "access_restricted":false,
+ "hidden":false,
+ "alias":null,
+ "inmenu":true,
+ "url":"/soustredeni/pripravujeme/",
+ "access_perm_type":1,
+ "access_permissions":[],
+ "hint":"",
+ "insitetree":true,
+ "tree":1,
+ "description":"",
+ "urlaspattern":false,
+ "access_guest":false,
+ "title":"Připravujeme",
+ "parent":4
+ },
+ "model":"sitetree.treeitem",
+ "pk":19
+ },
+ {
+ "pk":20,
+ "fields":{
+ "parent":4,
+ "tree":1,
+ "insitetree":true,
+ "description":"",
+ "access_guest":false,
+ "title":"Proběhlo",
+ "urlaspattern":false,
+ "alias":null,
+ "access_permissions":[],
+ "access_perm_type":1,
+ "url":"/soustredeni/probehlo/",
+ "inmenu":true,
+ "hint":"",
+ "sort_order":20,
+ "access_loggedin":false,
+ "inbreadcrumbs":true,
+ "hidden":false,
+ "access_restricted":false
+ },
+ "model":"sitetree.treeitem"
+ },
+ {
+ "pk":21,
+ "model":"sitetree.treeitem",
+ "fields":{
+ "urlaspattern":false,
+ "access_guest":false,
+ "title":"Profil",
+ "description":"",
+ "insitetree":true,
+ "tree":1,
+ "parent":null,
+ "access_restricted":false,
+ "hidden":false,
+ "inbreadcrumbs":true,
+ "sort_order":21,
+ "access_loggedin":true,
+ "hint":"",
+ "url":"/profil/",
+ "inmenu":true,
+ "access_permissions":[],
+ "access_perm_type":1,
+ "alias":null
+ }
+ },
+ {
+ "pk":22,
+ "fields":{
+ "parent":21,
+ "tree":1,
+ "insitetree":true,
+ "description":"",
+ "access_guest":false,
+ "title":"Osobní údaje",
+ "urlaspattern":false,
+ "alias":null,
+ "access_permissions":[],
+ "access_perm_type":1,
+ "inmenu":true,
+ "url":"/profil/osobni-udaje",
+ "hint":"",
+ "access_loggedin":false,
+ "sort_order":23,
+ "inbreadcrumbs":true,
+ "hidden":false,
+ "access_restricted":false
+ },
+ "model":"sitetree.treeitem"
+ },
+ {
+ "model":"sitetree.treeitem",
+ "fields":{
+ "access_loggedin":false,
+ "sort_order":36,
+ "access_restricted":false,
+ "hidden":false,
+ "inbreadcrumbs":true,
+ "inmenu":true,
+ "url":"/odeslat-reseni/",
+ "access_perm_type":1,
+ "access_permissions":[],
+ "alias":null,
+ "hint":"",
+ "insitetree":true,
+ "tree":1,
+ "urlaspattern":false,
+ "title":"Poslat řešení",
+ "access_guest":false,
+ "description":"",
+ "parent":21
+ },
+ "pk":23
+ },
+ {
+ "pk":24,
+ "fields":{
+ "tree":1,
+ "insitetree":true,
+ "description":"",
+ "title":"Témata",
+ "access_guest":false,
+ "urlaspattern":false,
+ "parent":5,
+ "access_loggedin":false,
+ "sort_order":35,
+ "inbreadcrumbs":true,
+ "hidden":false,
+ "access_restricted":false,
+ "alias":null,
+ "access_perm_type":1,
+ "access_permissions":[],
+ "url":"/archiv/temata/",
+ "inmenu":true,
+ "hint":""
+ },
+ "model":"sitetree.treeitem"
+ },
+ {
+ "model":"sitetree.treeitem",
+ "fields":{
+ "hint":"",
+ "alias":null,
+ "access_perm_type":1,
+ "access_permissions":[
+ 1
+ ],
+ "url":"/korektury/",
+ "inmenu":true,
+ "inbreadcrumbs":true,
+ "hidden":false,
+ "access_restricted":true,
+ "sort_order":28,
+ "access_loggedin":false,
+ "parent":null,
+ "description":"",
+ "title":"HIDDEN",
+ "access_guest":false,
+ "urlaspattern":false,
+ "tree":1,
+ "insitetree":true
+ },
+ "pk":28
+ },
+ {
+ "pk":30,
+ "fields":{
+ "description":"",
+ "title":"Aktuální",
+ "access_guest":false,
+ "urlaspattern":false,
+ "tree":1,
+ "insitetree":true,
+ "parent":28,
+ "inbreadcrumbs":true,
+ "hidden":false,
+ "access_restricted":false,
+ "sort_order":30,
+ "access_loggedin":false,
+ "hint":"",
+ "alias":null,
+ "access_perm_type":1,
+ "access_permissions":[],
+ "inmenu":true,
+ "url":"/korektury/"
+ },
+ "model":"sitetree.treeitem"
+ },
+ {
+ "pk":31,
+ "model":"sitetree.treeitem",
+ "fields":{
+ "alias":null,
+ "access_permissions":[],
+ "access_perm_type":1,
+ "url":"/korektury/zastarale/",
+ "inmenu":true,
+ "hint":"",
+ "access_loggedin":false,
+ "sort_order":31,
+ "inbreadcrumbs":true,
+ "hidden":false,
+ "access_restricted":false,
+ "parent":28,
+ "tree":1,
+ "insitetree":true,
+ "description":"",
+ "title":"Zastaralé",
+ "access_guest":false,
+ "urlaspattern":false
+ }
+ },
+ {
+ "fields":{
+ "alias":null,
+ "inmenu":true,
+ "url":"/korektury/help/",
+ "access_permissions":[],
+ "access_perm_type":1,
+ "hint":"",
+ "access_loggedin":false,
+ "sort_order":32,
+ "inbreadcrumbs":true,
+ "access_restricted":false,
+ "hidden":false,
+ "parent":28,
+ "insitetree":true,
+ "tree":1,
+ "description":"",
+ "urlaspattern":false,
+ "access_guest":false,
+ "title":"Nápověda"
+ },
+ "model":"sitetree.treeitem",
+ "pk":32
+ },
+ {
+ "model":"sitetree.treeitem",
+ "fields":{
+ "tree":1,
+ "insitetree":true,
+ "access_guest":false,
+ "title":"Aktuální číslo",
+ "urlaspattern":false,
+ "description":"",
+ "parent":3,
+ "access_loggedin":false,
+ "sort_order":15,
+ "hidden":false,
+ "access_restricted":false,
+ "inbreadcrumbs":true,
+ "access_perm_type":1,
+ "access_permissions":[],
+ "url":"/zadani/aktualni/",
+ "inmenu":true,
+ "alias":null,
+ "hint":""
+ },
+ "pk":33
+ },
+ {
+ "fields":{
+ "hint":"",
+ "alias":null,
+ "access_permissions":[],
+ "access_perm_type":1,
+ "url":"/zadani/temata/",
+ "inmenu":true,
+ "inbreadcrumbs":true,
+ "hidden":false,
+ "access_restricted":false,
+ "access_loggedin":false,
+ "sort_order":17,
+ "parent":3,
+ "description":"",
+ "title":"Témata",
+ "access_guest":false,
+ "urlaspattern":false,
+ "tree":1,
+ "insitetree":true
+ },
+ "model":"sitetree.treeitem",
+ "pk":34
+ },
+ {
+ "pk":35,
+ "model":"sitetree.treeitem",
+ "fields":{
+ "hint":"",
+ "access_permissions":[],
+ "access_perm_type":1,
+ "inmenu":true,
+ "url":"/archiv/rocniky/",
+ "alias":null,
+ "hidden":false,
+ "access_restricted":false,
+ "inbreadcrumbs":true,
+ "sort_order":24,
+ "access_loggedin":false,
+ "parent":5,
+ "access_guest":false,
+ "title":"Čísla",
+ "urlaspattern":false,
+ "description":"",
+ "tree":1,
+ "insitetree":true
+ }
+ },
+ {
+ "pk":36,
+ "fields":{
+ "inbreadcrumbs":true,
+ "access_restricted":false,
+ "hidden":false,
+ "sort_order":22,
+ "access_loggedin":false,
+ "hint":"",
+ "alias":null,
+ "inmenu":true,
+ "url":"/profil/",
+ "access_perm_type":1,
+ "access_permissions":[],
+ "description":"",
+ "urlaspattern":false,
+ "title":"Úvod",
+ "access_guest":false,
+ "insitetree":true,
+ "tree":1,
+ "parent":21
+ },
+ "model":"sitetree.treeitem"
+ },
+ {
+ "fields":{
+ "parent":21,
+ "description":"",
+ "urlaspattern":true,
+ "title":"Odevzdaná řešení",
+ "access_guest":false,
+ "insitetree":true,
+ "tree":1,
+ "hint":"",
+ "alias":null,
+ "inmenu":true,
+ "url":"odevzdavatko_tabulka",
+ "access_perm_type":1,
+ "access_permissions":[
+ 1
+ ],
+ "inbreadcrumbs":true,
+ "access_restricted":true,
+ "hidden":false,
+ "access_loggedin":false,
+ "sort_order":37
+ },
+ "model":"sitetree.treeitem",
+ "pk":37
+ },
+ {
+ "model":"sitetree.treeitem",
+ "fields":{
+ "inmenu":true,
+ "url":"/logout/",
+ "access_perm_type":1,
+ "access_permissions":[],
+ "alias":null,
+ "hint":"",
+ "access_loggedin":true,
+ "sort_order":38,
+ "access_restricted":false,
+ "hidden":false,
+ "inbreadcrumbs":true,
+ "parent":21,
+ "insitetree":true,
+ "tree":1,
+ "urlaspattern":false,
+ "title":"Odhlásit se",
+ "access_guest":false,
+ "description":""
+ },
+ "pk":38
+ }
]
diff --git a/seminar/admin.py b/seminar/admin.py
index 222cafb4..21951ea4 100644
--- a/seminar/admin.py
+++ b/seminar/admin.py
@@ -1,11 +1,14 @@
from django.contrib import admin
from django.contrib.auth.models import Permission
+from django.db import models
+from django.forms import widgets
from polymorphic.admin import PolymorphicParentModelAdmin, PolymorphicChildModelAdmin, PolymorphicChildModelFilter
from reversion.admin import VersionAdmin
from django_reverse_admin import ReverseModelAdmin
from solo.admin import SingletonModelAdmin
+
# Todo: reversion
import seminar.models as m
@@ -14,8 +17,6 @@ admin.site.register(m.Skola)
admin.site.register(m.Prijemce)
admin.site.register(m.Rocnik)
admin.site.register(m.Cislo)
-admin.site.register(m.Organizator)
-admin.site.register(m.Soustredeni)
@admin.register(m.Osoba)
class OsobaAdmin(admin.ModelAdmin):
@@ -42,7 +43,14 @@ class OsobaAdmin(admin.ModelAdmin):
org.save()
udelej_orgem.short_description = "Udělej vybraných osob organizátory"
+@admin.register(m.Organizator)
+class OrganizatorAdmin(admin.ModelAdmin):
+ search_fields = ['osoba__jmeno', 'osoba__prijmeni', 'prezdivka']
+@admin.register(m.Resitel)
+class ResitelAdmin(admin.ModelAdmin):
+ search_fields = ['jmeno', 'prijmeni', 'prezdivka']
+ ordering = ('osoba__jmeno','osoba__prijmeni')
@admin.register(m.Problem)
class ProblemAdmin(PolymorphicParentModelAdmin):
@@ -74,15 +82,55 @@ class KonferaAdmin(PolymorphicChildModelAdmin):
base_model = m.Konfera
show_in_index = True
+
class TextAdminInline(admin.TabularInline):
model = m.Text
+ formfield_overrides = {
+ models.TextField: {'widget': widgets.TextInput}
+ }
exclude = ['text_zkraceny_set','text_zkraceny']
+
admin.site.register(m.Text)
class ResitelInline(admin.TabularInline):
model = m.Resitel
extra = 1
-admin.site.register(m.Resitel)
+
+class SoustredeniUcastniciInline(admin.TabularInline):
+ model = m.Soustredeni_Ucastnici
+ extra = 1
+ fields = ['resitel','poznamka']
+ autocomplete_fields = ['resitel']
+ ordering = ['resitel__osoba__jmeno', 'resitel__osoba__prijmeni']
+ formfield_overrides = {
+ models.TextField: {'widget': widgets.TextInput}
+ }
+
+ def get_queryset(self,request):
+ qs = super().get_queryset(request)
+ return qs.select_related('resitel','soustredeni')
+
+class SoustredeniOrganizatoriInline(admin.TabularInline):
+ model = m.Soustredeni.organizatori.through
+ extra = 1
+ fields = ['organizator','poznamka']
+ autocomplete_fields = ['organizator']
+ ordering = ['organizator__osoba__jmeno','organizator__prijmeni']
+ formfield_overrides = {
+ models.TextField: {'widget': widgets.TextInput}
+ }
+
+ def get_queryset(self,request):
+ qs = super().get_queryset(request)
+ return qs.select_related('organizator', 'soustredeni')
+
+
+@admin.register(m.Soustredeni)
+class SoustredeniAdmin(admin.ModelAdmin):
+ model = m.Soustredeni
+ inline_type = 'tabular'
+ inlines = [SoustredeniUcastniciInline, SoustredeniOrganizatoriInline]
+
class PrilohaReseniInline(admin.TabularInline):
model = m.PrilohaReseni
@@ -92,6 +140,7 @@ admin.site.register(m.PrilohaReseni)
class Reseni_ResiteleInline(admin.TabularInline):
model = m.Reseni_Resitele
+
@admin.register(m.Reseni)
class ReseniAdmin(ReverseModelAdmin):
base_model = m.Reseni
@@ -106,7 +155,6 @@ admin.site.register(m.Hodnoceni)
admin.site.register(m.Pohadka)
admin.site.register(m.Obrazek)
-
# Polymorfismus pro stromy
# TODO: Inlines podle https://django-polymorphic.readthedocs.io/en/stable/admin.html
diff --git a/seminar/urls.py b/seminar/urls.py
index b730efc0..516fe7f2 100644
--- a/seminar/urls.py
+++ b/seminar/urls.py
@@ -63,7 +63,7 @@ urlpatterns = [
path('stare-novinky/', views.StareNovinkyView.as_view(), name='stare_novinky'),
# Clanky
- path('clanky/resitel/', views.ClankyResitelView.as_view(), name='clanky_resitel'),
+ path('archiv/clanky/', views.ClankyResitelView.as_view(), name='clanky_resitel'),
#path('clanky/org/', views.ClankyOrganizatorView.as_view(), name='clanky_organizator'),
# Aesop