Commit 0f2a36a6 by Matt Drayer

Merge pull request #8908 from edx/asadiqbal08/SOL-1050

asadiqbal08/SOL-1050: Support split mongo course id for Twitter sharing URL
parents 3f432d49 19d9ccbf
......@@ -57,7 +57,6 @@ from opaque_keys.edx.keys import UsageKey
from openedx.core.djangoapps.course_groups.cohorts import add_user_to_cohort, is_course_cohorted
from student.models import CourseEnrollment, CourseAccessRole
from verify_student.models import SoftwareSecurePhotoVerification
from util.query import use_read_replica_if_available
# define different loggers for use within tasks and on client side
TASK_LOG = logging.getLogger('edx.celery.task')
......@@ -1262,7 +1261,7 @@ def generate_students_certificates(
that are enrolled.
"""
start_time = time()
enrolled_students = use_read_replica_if_available(CourseEnrollment.objects.users_enrolled_in(course_id))
enrolled_students = CourseEnrollment.objects.users_enrolled_in(course_id)
task_progress = TaskProgress(action_name, enrolled_students.count(), start_time)
current_step = {'step': 'Calculating students already have certificates'}
......@@ -1386,7 +1385,7 @@ def students_require_certificate(course_id, enrolled_students):
:param enrolled_students:
"""
# compute those students where certificates already generated
students_already_have_certs = use_read_replica_if_available(User.objects.filter(
students_already_have_certs = User.objects.filter(
~Q(generatedcertificate__status=CertificateStatuses.unavailable),
generatedcertificate__course_id=course_id))
generatedcertificate__course_id=course_id)
return list(set(enrolled_students) - set(students_already_have_certs))
......@@ -76,7 +76,7 @@ from django.core.urlresolvers import reverse
</button>
%endif
% if share_settings.get('CERTIFICATE_TWITTER', False):
<% twitter_url = 'https://twitter.com/intent/tweet?text=' + twitter_share_text + '&url='+ share_url%>
<% twitter_url = 'https://twitter.com/intent/tweet?text=' + twitter_share_text + '&url='+ urllib.quote_plus(share_url)%>
<button data-tooltip="${_('Share on Twitter')}"
class="action action-share-twitter btn btn-overlay btn-small icon-only"
title="${_('Share on Twitter')}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment