diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..4843d9db --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +# Ignore in language detection +app/Entirety/static/bootstrap/** linguist-vendored +app/Entirety/static/htmx/** linguist-vendored diff --git a/.github/issue-branch.yml b/.github/issue-branch.yml index e462353d..b7cc7d9e 100644 --- a/.github/issue-branch.yml +++ b/.github/issue-branch.yml @@ -1,5 +1,5 @@ # configuration file for automatic issue branch creation -branchName: '${issue.number}-${issue.title}' +branchName: '${issue.number}-${issue.title,}' silent: true autoCloseIssue: true gitSafeReplacementChar: '-' diff --git a/README.md b/README.md index 1e1cf320..cf17ce89 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ pip ```bash - cd ./app/entirety + cd ./app/Entirety pip install -r requirements.txt ``` @@ -87,6 +87,8 @@ See [changelog](./docs/CHANGELOG.md) for detailed overview of changes. [@sbanoeon](https://github.com/sbanoeon) +[@djs0109](https://github.com/djs0109) + [@dnikolay-ebc](https://github.com/dnikolay-ebc) ## License diff --git a/app/Entirety/entirety/urls.py b/app/Entirety/entirety/urls.py index 84c7c751..308d0640 100644 --- a/app/Entirety/entirety/urls.py +++ b/app/Entirety/entirety/urls.py @@ -23,7 +23,9 @@ handler403 = "entirety.views.custom_permission_denied_view" handler400 = "entirety.views.custom_bad_request_view" + urlpatterns = [ + path("admin/login/", views.CustomLogin.as_view()), path("admin/", admin.site.urls), path("", views.home, name="home"), path("projects/", include("projects.urls")), diff --git a/app/Entirety/entirety/views.py b/app/Entirety/entirety/views.py index cb0c3dac..1c9e6557 100644 --- a/app/Entirety/entirety/views.py +++ b/app/Entirety/entirety/views.py @@ -1,6 +1,17 @@ import requests +from django.http import HttpResponseRedirect +from django.urls import reverse from django.shortcuts import render +from django.views.generic import View + + +class CustomLogin(View): + def get(self, request, **kwargs): + return HttpResponseRedirect( + reverse("oidc_authentication_init") + + ("?next={}".format(request.GET["next"]) if "next" in request.GET else "") + ) def home(request):