-
-
- <%block name="viewtitle">
-
-
-<%block name="viewcontent">
-
diff --git a/cms/templates/maintenance/container.html b/cms/templates/maintenance/container.html
deleted file mode 100644
index 0b6d22dc7f..0000000000
--- a/cms/templates/maintenance/container.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<%page expression_filter="h"/>
-<%inherit file="base.html" />
-<%namespace name='static' file='../static_content.html'/>
-<%!
-from django.core.urlresolvers import reverse
-from openedx.core.djangolib.js_utils import js_escaped_string
-%>
-<%block name="title">${view['name']}
-<%block name="viewtitle">
-
- ${view['name']}
-
-
-
-<%block name="js_extra">
-
-
-
-<%block name="viewcontent">
-
- <%include file="_${view['slug']}.html"/>
- <%block name="requirejs">
- require(["js/maintenance/${view['slug'] | n, js_escaped_string}"], function(MaintenanceFactory) {
- MaintenanceFactory("${reverse(view['url']) | n, js_escaped_string}");
- });
-
-
-
diff --git a/cms/templates/maintenance/index.html b/cms/templates/maintenance/index.html
deleted file mode 100644
index f1f3224fe1..0000000000
--- a/cms/templates/maintenance/index.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<%page expression_filter="h"/>
-<%inherit file="base.html" />
-<%namespace name='static' file='../static_content.html'/>
-<%!
-from django.utils.translation import ugettext as _
-from django.core.urlresolvers import reverse
-%>
-<%block name="title">${_('Maintenance Dashboard')}
-<%block name="viewcontent">
-
-
- % for view in views.values():
- -
- ${view['name']}
- ${view['description']}
-
- % endfor
-
-
-
diff --git a/cms/templates/widgets/user_dropdown.html b/cms/templates/widgets/user_dropdown.html
index d118a25c18..bebc2e21d0 100644
--- a/cms/templates/widgets/user_dropdown.html
+++ b/cms/templates/widgets/user_dropdown.html
@@ -4,7 +4,6 @@
from django.conf import settings
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext as _
- from student.roles import GlobalStaff
%>
% if uses_pattern_library:
@@ -46,11 +45,6 @@
${_("{studio_name} Home").format(studio_name=settings.STUDIO_SHORT_NAME)}
- % if GlobalStaff().has_user(user):
-
- ${_("Maintenance")}
-
- % endif
${_("Sign Out")}
diff --git a/cms/urls.py b/cms/urls.py
index d4e2c08dfa..9ee1751a68 100644
--- a/cms/urls.py
+++ b/cms/urls.py
@@ -184,12 +184,6 @@ if settings.FEATURES.get('CERTIFICATES_HTML_VIEW'):
'contentstore.views.certificates.certificates_list_handler')
)
-# Maintenance Dashboard
-urlpatterns += patterns(
- '',
- url(r'^maintenance/', include('maintenance.urls', namespace='maintenance')),
-)
-
urlpatterns += (
# These views use a configuration model to determine whether or not to
# display the Programs authoring app. If disabled, a 404 is returned.
diff --git a/common/djangoapps/util/views.py b/common/djangoapps/util/views.py
index 6493186fff..26d9336cdf 100644
--- a/common/djangoapps/util/views.py
+++ b/common/djangoapps/util/views.py
@@ -4,13 +4,12 @@ import sys
from functools import wraps
from django.conf import settings
-from django.contrib.auth.decorators import login_required
from django.core.cache import caches
from django.core.validators import ValidationError, validate_email
from django.views.decorators.csrf import requires_csrf_token
from django.views.defaults import server_error
from django.http import (Http404, HttpResponse, HttpResponseNotAllowed,
- HttpResponseServerError, HttpResponseForbidden)
+ HttpResponseServerError)
import dogstats_wrapper as dog_stats_api
from edxmako.shortcuts import render_to_response
import zendesk
@@ -22,8 +21,6 @@ import track.views
from opaque_keys import InvalidKeyError
from opaque_keys.edx.keys import CourseKey
-from student.roles import GlobalStaff
-
log = logging.getLogger(__name__)
@@ -47,21 +44,6 @@ def ensure_valid_course_key(view_func):
return inner
-def require_global_staff(func):
- """View decorator that requires that the user have global staff permissions. """
- @wraps(func)
- def wrapped(request, *args, **kwargs): # pylint: disable=missing-docstring
- if GlobalStaff().has_user(request.user):
- return func(request, *args, **kwargs)
- else:
- return HttpResponseForbidden(
- u"Must be {platform_name} staff to perform this action.".format(
- platform_name=settings.PLATFORM_NAME
- )
- )
- return login_required(wrapped)
-
-
@requires_csrf_token
def jsonable_server_error(request, template_name='500.html'):
"""
diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py
index 74838d8048..39e3d42568 100644
--- a/lms/djangoapps/instructor/views/api.py
+++ b/lms/djangoapps/instructor/views/api.py
@@ -35,7 +35,6 @@ from util.file import (
FileValidationException, UniversalNewlineIterator
)
from util.json_request import JsonResponse, JsonResponseBadRequest
-from util.views import require_global_staff
from instructor.views.instructor_task_helpers import extract_email_features, extract_task_features
from courseware.access import has_access
@@ -206,6 +205,20 @@ def require_level(level):
return decorator
+def require_global_staff(func):
+ """View decorator that requires that the user have global staff permissions. """
+ def wrapped(request, *args, **kwargs): # pylint: disable=missing-docstring
+ if GlobalStaff().has_user(request.user):
+ return func(request, *args, **kwargs)
+ else:
+ return HttpResponseForbidden(
+ u"Must be {platform_name} staff to perform this action.".format(
+ platform_name=theming_helpers.get_value('PLATFORM_NAME', settings.PLATFORM_NAME)
+ )
+ )
+ return wrapped
+
+
def require_sales_admin(func):
"""
Decorator for checking sales administrator access before executing an HTTP endpoint. This decorator