From 21640478787e36d2faa32fa57014264862a3ebb0 Mon Sep 17 00:00:00 2001 From: Dirk Alders Date: Tue, 8 Oct 2024 15:00:14 +0200 Subject: [PATCH] Issues (TODO) moved to issuetracker --- pages/access.py | 6 ++---- pages/page.py | 3 --- pages/views.py | 3 --- piki/urls.py | 4 ++++ users | 2 +- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/pages/access.py b/pages/access.py index 453e321..083fd77 100644 --- a/pages/access.py +++ b/pages/access.py @@ -1,5 +1,3 @@ -# TODO: Implement access control for pages - def read_page(request, rel_path): return "private" not in rel_path or write_page(request, rel_path) @@ -9,10 +7,10 @@ def write_page(request, rel_path): def read_attachment(request, rel_path): - # TODO: /!\ rel_path is the filsystem rel_path - caused by the flat folder structure /!\ + # /!\ rel_path is the filsystem rel_path - caused by the flat folder structure /!\ return True def modify_attachment(request, rel_path): - # TODO: /!\ rel_path is the filsystem rel_path - caused by the flat folder structure /!\ + # /!\ rel_path is the filsystem rel_path - caused by the flat folder structure /!\ return request.user.is_authenticated and request.user.username in ['root', 'dirk'] diff --git a/pages/page.py b/pages/page.py index 28280dd..7b02efa 100644 --- a/pages/page.py +++ b/pages/page.py @@ -1,8 +1,5 @@ from django.conf import settings -# TODO: PRIO: Add wildcards for subpages filter -# TODO: Add whoosh and search - import fstools from pages import messages, url_page import mycreole diff --git a/pages/views.py b/pages/views.py index 3e432fa..0c8ca5e 100644 --- a/pages/views.py +++ b/pages/views.py @@ -21,9 +21,6 @@ except ImportError: ROOT_LOGGER_NAME = 'root' logger = logging.getLogger(ROOT_LOGGER_NAME).getChild(__name__) -# TODO: /!\ Deactivate self registration -# TODO: /!\ Remove config and add config_example with data from mm_tmux /!\ - def root(request): return HttpResponseRedirect(url_page(request, config.STARTPAGE)) diff --git a/piki/urls.py b/piki/urls.py index 7f5447a..a02dbe4 100644 --- a/piki/urls.py +++ b/piki/urls.py @@ -24,14 +24,18 @@ import pages.views urlpatterns = [ path('admin/', admin.site.urls), # + # page path('', pages.views.root, name='page-root'), path('page/', pages.views.root, name='page-root'), path('page/', pages.views.page, name='page-page'), path('pageedit//', pages.views.edit, name='page-edit'), path('helpview/', pages.views.helpview, name='page-helpview'), path('helpview/', pages.views.helpview, name='page-helpview'), + # theme path('search/', pages.views.search, name='search'), + # mycreole path('mycreole/', include('mycreole.urls')), + # users path('users/', include('users.urls')), ] diff --git a/users b/users index 57852e6..6b55e81 160000 --- a/users +++ b/users @@ -1 +1 @@ -Subproject commit 57852e6ec8867543fbcd9915ae5b6d092aafe339 +Subproject commit 6b55e81816ace1583051c8c62298c8a7281e2fcb