From 18a6a0487b85e46c62a81b57b5b55e5e561b9d89 Mon Sep 17 00:00:00 2001 From: Mat Peterson Date: Mon, 11 Aug 2014 18:42:36 +0000 Subject: [PATCH] added JS to outline page after bulk publishing rewrite --- cms/djangoapps/contentstore/views/course.py | 3 ++- cms/static/js/views/pages/course_outline.js | 19 +++++++++++++++++-- cms/templates/index.html | 4 ++-- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py index 854028c9b7..2bf9efa36a 100644 --- a/cms/djangoapps/contentstore/views/course.py +++ b/cms/djangoapps/contentstore/views/course.py @@ -395,7 +395,8 @@ def course_listing(request): 'user': request.user, 'request_course_creator_url': reverse('contentstore.views.request_course_creator'), 'course_creator_status': _get_course_creator_status(request.user), - 'allow_unicode_course_id': settings.FEATURES.get('ALLOW_UNICODE_COURSE_ID', False) + 'allow_unicode_course_id': settings.FEATURES.get('ALLOW_UNICODE_COURSE_ID', False), + 'allow_course_reruns': settings.FEATURES.get('ALLOW_COURSE_RERUNS', True) }) diff --git a/cms/static/js/views/pages/course_outline.js b/cms/static/js/views/pages/course_outline.js index a227642945..62510a6c43 100644 --- a/cms/static/js/views/pages/course_outline.js +++ b/cms/static/js/views/pages/course_outline.js @@ -1,9 +1,9 @@ /** * This page is used to show the user an outline of the course. */ -define(["jquery", "underscore", "gettext", "js/views/pages/base_page", "js/views/utils/xblock_utils", +define(["domReady", "jquery", "underscore", "gettext", "js/views/pages/base_page", "js/views/utils/xblock_utils", "js/views/course_outline"], - function ($, _, gettext, BasePage, XBlockViewUtils, CourseOutlineView) { + function (domReady, $, _, gettext, BasePage, XBlockViewUtils, CourseOutlineView) { var expandedLocators, CourseOutlinePage; CourseOutlinePage = BasePage.extend({ @@ -149,5 +149,20 @@ define(["jquery", "underscore", "gettext", "js/views/pages/base_page", "js/views } }; + var dismissNotification = function (e) { + e.preventDefault(); + $.ajax({ + url: $('.dismiss-button').data('dismiss-link'), + type: 'DELETE', + success: function(result) { + $('.wrapper-alert-announcement').removeClass('is-shown').addClass('is-hidden') + } + }); + }; + + domReady(function () { + $('.dismiss-button').bind('click', dismissNotification); + }); + return CourseOutlinePage; }); // end define(); diff --git a/cms/templates/index.html b/cms/templates/index.html index 5fa9885fba..d4f475b63c 100644 --- a/cms/templates/index.html +++ b/cms/templates/index.html @@ -132,7 +132,7 @@ require(["domReady!", "jquery", "jquery.form", "js/index"], function(doc, $) { % endif - %if len(unsucceeded_course_actions) > 0: + %if allow_course_reruns and len(unsucceeded_course_actions) > 0:

Courses Being Processed

@@ -248,7 +248,7 @@ require(["domReady!", "jquery", "jquery.form", "js/index"], function(doc, $) {