diff --git a/aplus/settings.py b/aplus/settings.py
index 75787aea1..6a6d9664b 100644
--- a/aplus/settings.py
+++ b/aplus/settings.py
@@ -4,6 +4,8 @@
# You can copy local_settings.example.py and start from there.
##
from os.path import abspath, dirname, join
+
+from django.conf import settings
from lib.logging import skip_unreadable_post
from os import environ
from r_django_essentials.conf import (
@@ -313,6 +315,9 @@
LOGIN_REDIRECT_URL = "/"
LOGIN_ERROR_URL = "/accounts/login/"
+def gitmanager_url(request):
+ return {'gitmanager_url': settings.GITMANAGER_URL}
+
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
@@ -332,6 +337,7 @@
"django.contrib.messages.context_processors.messages",
"lib.context_processors.aplus_version",
"lib.context_processors.gitmanager_enabled",
+ "lib.context_processors.gitmanager_url"
],
},
},
diff --git a/edit_course/templates/edit_course/edit_gitmanager.html b/edit_course/templates/edit_course/edit_gitmanager.html
index 062211501..30fd24403 100644
--- a/edit_course/templates/edit_course/edit_gitmanager.html
+++ b/edit_course/templates/edit_course/edit_gitmanager.html
@@ -21,6 +21,9 @@
+ {% csrf_token %}
+ {% translate "GO_TO_GITMANAGER_PAGE" %}
+
{% translate "UPDATING_GITMANAGER" %}
@@ -31,6 +34,7 @@
{% block scripts %}
{{ block.super }}
+
{% endblock %}
diff --git a/edit_course/templatetags/editcourse.py b/edit_course/templatetags/editcourse.py
index 0d384f4a4..4280bdc0d 100644
--- a/edit_course/templatetags/editcourse.py
+++ b/edit_course/templatetags/editcourse.py
@@ -1,5 +1,6 @@
from django import template
from django.urls import reverse
+from django.conf import settings
from course.models import CourseInstance
@@ -33,7 +34,6 @@ def removeurl(model_object, model_name):
id=model_object.id,
))
-
@register.filter
def createurl(model_object, model_name):
type_name = None
diff --git a/edit_course/urls.py b/edit_course/urls.py
index 04bd22a6a..7f3a41bbb 100644
--- a/edit_course/urls.py
+++ b/edit_course/urls.py
@@ -1,11 +1,10 @@
from django.urls import re_path
+import authorization.api.views
from course.urls import EDIT_URL_PREFIX
from . import views
-
MODEL_URL_PREFIX = EDIT_URL_PREFIX + r'(?P[\w\d\-]+)/'
-
urlpatterns = [
re_path(EDIT_URL_PREFIX + r'$',
views.EditContentView.as_view(),
diff --git a/edit_course/views.py b/edit_course/views.py
index bd8924055..1e8a4cee4 100644
--- a/edit_course/views.py
+++ b/edit_course/views.py
@@ -412,6 +412,7 @@ def form_valid(self, form):
"git_branch": form.cleaned_data['git_branch'],
"update_hook": form.cleaned_data['update_hook'],
"webhook_secret": form.cleaned_data['webhook_secret'],
+ "gitmanager_url": settings.GITMANAGER_URL,
}
permissions = Permissions()
diff --git a/lib/context_processors.py b/lib/context_processors.py
index be40d225b..ed6d73cfd 100644
--- a/lib/context_processors.py
+++ b/lib/context_processors.py
@@ -14,3 +14,8 @@ def gitmanager_enabled(request):
return {
'GITMANAGER_ENABLED': bool(settings.GITMANAGER_URL),
}
+
+def gitmanager_url(request):
+ return {
+ 'GITMANAGER_URL': settings.GITMANAGER_URL,
+ }