From 86321c2cc16f6cb73d5c7afa7f2da64dd18b9493 Mon Sep 17 00:00:00 2001 From: Julia Hansbrough Date: Fri, 4 Oct 2013 15:33:11 +0000 Subject: [PATCH] added self to authors style, changed GET to POST --- CHANGELOG.rst | 2 ++ common/djangoapps/terrain/course_helpers.py | 15 ++++++++++++++- lms/djangoapps/instructor/tests/test_email.py | 1 - lms/djangoapps/instructor/views/api.py | 10 +++++----- .../sass/course/instructor/_instructor_2.scss | 5 ++++- .../instructor_dashboard_2/send_email.html | 1 - 6 files changed, 25 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f7891ae817..ce8b40037e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,6 +9,8 @@ LMS: Disable data download buttons on the instructor dashboard for large courses LMS: Ported bulk emailing to the beta instructor dashboard. +LMS: Ported bulk emailing to the beta instructor dashboard. + LMS: Refactor and clean student dashboard templates. LMS: Fix issue with CourseMode expiration dates diff --git a/common/djangoapps/terrain/course_helpers.py b/common/djangoapps/terrain/course_helpers.py index 0c95386445..4112554547 100644 --- a/common/djangoapps/terrain/course_helpers.py +++ b/common/djangoapps/terrain/course_helpers.py @@ -41,7 +41,6 @@ def log_in(username='robot', password='test', email='robot@edx.org', name='Robot @world.absorb -<<<<<<< HEAD def register_by_course_id(course_id, username='robot', password='test', is_staff=False): create_user(username, password) user = User.objects.get(username=username) @@ -64,6 +63,20 @@ def add_to_course_staff(username, course_num): user = User.objects.get(username=username) user.groups.add(group) +@world.absorb +def add_to_course_staff(username, course_num): + """ + Add the user with `username` to the course staff group + for `course_num`. + """ + # Based on code in lms/djangoapps/courseware/access.py + group_name = "instructor_{}".format(course_num) + group, _ = Group.objects.get_or_create(name=group_name) + group.save() + + user = User.objects.get(username=username) + user.groups.add(group) + @world.absorb def clear_courses(): diff --git a/lms/djangoapps/instructor/tests/test_email.py b/lms/djangoapps/instructor/tests/test_email.py index 0bc8140c14..fadf227cc1 100644 --- a/lms/djangoapps/instructor/tests/test_email.py +++ b/lms/djangoapps/instructor/tests/test_email.py @@ -54,7 +54,6 @@ class TestInstructorDashboardEmailView(ModuleStoreTestCase): # Enabled and IS mongo @patch.dict(settings.MITX_FEATURES, {'ENABLE_INSTRUCTOR_EMAIL': True}) def test_email_flag_true(self): - from nose.tools import set_trace; set_trace() # Assert that the URL for the email view is in the response response = self.client.get(self.url) self.assertTrue(self.email_link in response.content) diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py index b184ad4ae8..b8b0ffc877 100644 --- a/lms/djangoapps/instructor/views/api.py +++ b/lms/djangoapps/instructor/views/api.py @@ -749,19 +749,19 @@ def list_forum_members(request, course_id): @ensure_csrf_cookie @cache_control(no_cache=True, no_store=True, must_revalidate=True) @require_level('staff') -@require_query_params(send_to="sending to whom", subject="subject line", message="message text") +@require_post_params(send_to="sending to whom", subject="subject line", message="message text") def send_email(request, course_id): """ Send an email to self, staff, or everyone involved in a course. - Query Paramaters: + Query Parameters: - 'send_to' specifies what group the email should be sent to - 'subject' specifies email's subject - 'message' specifies email's content """ course = get_course_by_id(course_id) - send_to = request.GET.get("send_to") - subject = request.GET.get("subject") - message = request.GET.get("message") + send_to = request.POST.get("send_to") + subject = request.POST.get("subject") + message = request.POST.get("message") text_message = html_to_text(message) email = CourseEmail( course_id=course_id, diff --git a/lms/static/sass/course/instructor/_instructor_2.scss b/lms/static/sass/course/instructor/_instructor_2.scss index 2862de27dc..6efa99fe07 100644 --- a/lms/static/sass/course/instructor/_instructor_2.scss +++ b/lms/static/sass/course/instructor/_instructor_2.scss @@ -265,10 +265,13 @@ section.instructor-dashboard-content-2 { margin-bottom: 20px; font-weight: 600; color: green; + + .copy { + font-weight: 600; + } } .msg-confirm { - border-top: 2px solid green; background: tint(green,90%); display: none; } diff --git a/lms/templates/instructor/instructor_dashboard_2/send_email.html b/lms/templates/instructor/instructor_dashboard_2/send_email.html index b19cd1f587..42eaa7ddaf 100644 --- a/lms/templates/instructor/instructor_dashboard_2/send_email.html +++ b/lms/templates/instructor/instructor_dashboard_2/send_email.html @@ -45,6 +45,5 @@ -