Skip to content

C
course-discovery
Commit d632b68a by Asad Azam Committed by AsadAzam
Options

if preview declined the url should not dissapear

parent e27d7c3d
Showing with 163 additions and 148 deletions
course_discovery/apps/publisher/templates/publisher/_approval_widget.html
......@@ -2,11 +2,11 @@
<div class="approval-widget">
<h5 class="hd-5 emphasized approvals-heading">{% trans "REVIEWS" %}</h5>
{% if is_course_run and not object.course.course_state.is_approved %}
{% if is_course_run and not course_run.course.course_state.is_approved %}
<div class="parent-course-approval">
{% url 'publisher:publisher_course_detail' object.course.id as course_url %}
{% url 'publisher:publisher_course_detail' course_run.course.id as course_url %}
{% with link_start='<a href="' link_middle='">' link_end='</a>' %}
{% blocktrans with course_name=object.course.title trimmed %}
{% blocktrans with course_name=course_run.course.title trimmed %}
You can currently edit information for this course run. However, before you can submit this course run for review, you must finalize the information for {{ link_start }}{{ course_url }}{{ link_middle }}{{ course_name }}{{ link_end }} with edX.
{% endblocktrans %}
{% endwith %}
......@@ -19,8 +19,8 @@
<div class="preview-container">
<div class="layout-1q3q layout-reversed">
<div class="layout-col layout-col-a">
{% if object.preview_url %}
{% if object.preview_url and object.course.course_team_admin == request.user and object.course_run_state.is_approved and not object.course_run_state.is_preview_accepted %}
{% if course_run.preview_url %}
{% if is_in_preview_review and course_run.course.course_team_admin == request.user %}
<button class="btn btn-neutral btn-preview btn-preview-decline" type="button">
{% trans "Decline" %}
</button>
......@@ -33,17 +33,21 @@
{% trans "Accepted" %}<br>
{{ preview_accepted_date|date:'m/d/y H:i a' }}
</span>
{% if object.course_run_state.is_ready_to_publish and object.course.publisher == request.user %}
<button class="btn-brand btn-base btn-publish" data-change-state-url="{% url 'publisher:api:change_course_run_state' object.course_run_state.id %}" data-state-name="{{ publish_state_name }}" type="button">
{% if course_run.course_run_state.is_ready_to_publish and course_run.course.publisher == request.user %}
<button class="btn-brand btn-base btn-publish" data-change-state-url="{% url 'publisher:api:change_course_run_state' course_run.course_run_state.id %}" data-state-name="{{ publish_state_name }}" type="button">
{% trans "Publish" %}
</button>
{% endif %}
{% elif object.course.publisher == request.user %}
{% elif course_run.course.publisher == request.user %}
{% if course_run.course_run_state.owner_role == 'course_team' %}
<span class="preview-status">{% trans "Submitted for review" %}</span>
<button data-url="{% url 'publisher:api:update_course_run' object.id %}" class="btn btn-neutral btn-edit-preview-url">{% trans "Edit" %}</button>
{% else %}
<span class="preview-status">{% trans "Preview Declined" %}</span>
{% endif %}
<button data-url="{% url 'publisher:api:update_course_run' course_run.id %}" class="btn btn-neutral btn-edit-preview-url">{% trans "Edit" %}</button>
{% endif %}
{% elif object.course.publisher == request.user %}
<button data-url="{% url 'publisher:api:update_course_run' object.id %}" class="btn btn-neutral btn-save-preview-url">{% trans "Save" %}</button>
{% elif course_run.course.publisher == request.user %}
<button data-url="{% url 'publisher:api:update_course_run' course_run.id %}" class="btn btn-neutral btn-save-preview-url">{% trans "Save" %}</button>
{% endif %}
</div>
<div class="layout-col layout-col-b">
......@@ -51,11 +55,11 @@
<strong>{% trans "ABOUT PAGE PREVIEW" %}</strong>
</span>
<div class="preview-url">
{% if object.preview_url %}
{% if course_run.preview_url %}
<span class="preview-url-heading">{% trans "Preview URL" %} - </span>
<a href="{{ object.preview_url }}" target="_blank">{% trans "View About page preview" %}</a>
<a href="{{ course_run.preview_url }}" target="_blank">{% trans "View About page preview" %}</a>
{% else %}
{% if object.course.publisher == request.user %}
{% if course_run.course.publisher == request.user %}
<input id="id-review-url" type="text">
<span class="error-message"></span>
{% else %}
......
course_discovery/apps/publisher/templates/publisher/course_run_detail/_all.html
......@@ -7,8 +7,8 @@
{% trans "Studio URL" %}
</div>
<div>
{% if object.studio_url %}
<a target="_blank" href="{{ object.studio_url }}">{{ object.lms_course_id }}</a>
{% if course_run.studio_url %}
<a target="_blank" href="{{ course_run.studio_url }}">{{ course_run.lms_course_id }}</a>
{% else %}
{% trans "(Required) To be added by edX" %}
{% endif %}
......@@ -19,41 +19,41 @@
<div class="heading">
{% trans "Start Date (time in UTC)" %}
</div>
<div>{{ object.start }}</div>
<div>{{ course_run.start }}</div>
</div>
<div class="info-item">
<div class="heading">
{% trans "End Date (time in UTC)" %}
</div>
<div>{{ object.end }}</div>
<div>{{ course_run.end }}</div>
</div>
<div class="info-item">
<div class="heading">
{% trans "Enrollment Track" %}
</div>
<div>{{ object.course_type }}</div>
<div>{{ course_run.course_type }}</div>
</div>
{% if object.seat_price %}
{% if course_run.seat_price %}
<div class="info-item">
<div class="heading">
{% trans "Certificate Price" %}
</div>
<div>
${{ object.seat_price }}
${{ course_run.seat_price }}
</div>
</div>
{% endif %}
{% if object.credit_seat_price %}
{% if course_run.credit_seat_price %}
<div class="info-item">
<div class="heading">
{% trans "Credit Price" %}
</div>
<div>
${{ object.credit_seat_price }}
${{ course_run.credit_seat_price }}
</div>
</div>
{% endif %}
......@@ -63,10 +63,10 @@
{% trans "Course Staff" %}
</div>
<div>
{% if not object.course_staff %}
{% if not course_run.course_staff %}
{% trans "(Required) Not yet added" %}
{% else %}
{% for obj in object.course_staff %}
{% for obj in course_run.course_staff %}
<div class="course-staff">
<img src="{{ obj.image_url }}" alt=""/>
......@@ -92,12 +92,12 @@
{% trans "Estimated Effort" %}
</div>
<div>
{% if object.min_effort and object.max_effort %}
{{ object.min_effort }}-{{ object.max_effort }} {% trans "hours per week" %}
{% elif object.min_effort %}
{{ object.min_effort }} {% trans "hours per week" %}
{% if course_run.min_effort and course_run.max_effort %}
{{ course_run.min_effort }}-{{ course_run.max_effort }} {% trans "hours per week" %}
{% elif course_run.min_effort %}
{{ course_run.min_effort }} {% trans "hours per week" %}
{% else %}
{% with object.estimated_effort as field %}
{% with course_run.estimated_effort as field %}
{% include "publisher/_render_required_field.html" %}
{% endwith %}
{% endif %}
......@@ -109,7 +109,7 @@
{% trans "Course Content Language" %}
</div>
<div>
{% with object.language.name as field %}
{% with course_run.language.name as field %}
{% include "publisher/_render_required_field.html" %}
{% endwith %}
</div>
......@@ -120,7 +120,7 @@
{% trans "Video Transcript Language" %}
</div>
<div>
{% with object.transcript_languages as field %}
{% with course_run.transcript_languages as field %}
{% include "publisher/_render_required_field.html" %}
{% endwith %}
</div>
......@@ -131,7 +131,7 @@
{% trans "Course Video Language" %}
</div>
<div>
{% with object.video_language as field %}
{% with course_run.video_language as field %}
{% include "publisher/_render_required_field.html" %}
{% endwith %}
</div>
......@@ -142,7 +142,7 @@
{% trans "Course Length (Weeks)" %}
</div>
<div>
{% with object.length as field %}
{% with course_run.length as field %}
{% include "publisher/_render_required_field.html" %}
{% endwith %}
</div>
......@@ -153,7 +153,7 @@
{% trans "MicroMasters Program Name" %}
</div>
<div>
{% with object.micromasters_name as field %}
{% with course_run.micromasters_name as field %}
{% include "publisher/_render_optional_field.html" %}
{% endwith %}
</div>
......@@ -164,7 +164,7 @@
{% trans "XSeries Program Name" %}
</div>
<div>
{% with object.xseries_name as field %}
{% with course_run.xseries_name as field %}
{% include "publisher/_render_optional_field.html" %}
{% endwith %}
</div>
......@@ -175,7 +175,7 @@
{% trans "Professional Certificate Program Name" %}
</div>
<div>
{% with object.professional_certificate_name as field %}
{% with course_run.professional_certificate_name as field %}
{% include "publisher/_render_optional_field.html" %}
{% endwith %}
</div>
......
course_discovery/apps/publisher/templates/publisher/course_run_detail/_cat.html
......@@ -8,7 +8,7 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% with object.lms_course_id as field %}
{% with course_run.lms_course_id as field %}
{% include "publisher/_render_required_field.html" %}
{% endwith %}
</div>
......@@ -18,7 +18,7 @@
{% trans "Enrollment Types" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.course_type|capfirst }}</div>
<div class="copy">{{ course_run.course_type|capfirst }}</div>
</div>
</div>
......
course_discovery/apps/publisher/templates/publisher/course_run_detail/_credit_seat.html
{% load i18n %}
<h3 class="hd-6 seat-set-hd">{% trans "Credit Seats" %}</h3>
{% if object.credit_seat %}
{% if course_run.credit_seat %}
<div class="seat-set">
<table class="table">
<tr>
......@@ -11,11 +11,11 @@
<th scope="col">{% trans "Upgrade Deadline (time in UTC)" %}</th>
</tr>
<tr>
<td>{{ object.credit_seat.credit_provider}}</td>
<td>{{ object.credit_seat.price}}</td>
<td>{{ object.credit_seat.currency.name}}</td>
<td>{{ object.credit_seat.credit_hours }}</td>
<td>{{ object.credit_seat.upgrade_deadline }}</td>
<td>{{ course_run.credit_seat.credit_provider}}</td>
<td>{{ course_run.credit_seat.price}}</td>
<td>{{ course_run.credit_seat.currency.name}}</td>
<td>{{ course_run.credit_seat.credit_hours }}</td>
<td>{{ course_run.credit_seat.upgrade_deadline }}</td>
</tr>
</table>
......
course_discovery/apps/publisher/templates/publisher/course_run_detail/_drupal.html
......@@ -6,14 +6,14 @@
{% trans "Title" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.title }}</div>
<div class="copy">{{ course_run.title }}</div>
</div>
<div class="info-item">
<div class="heading">
{% trans "Number" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.number }}</div>
<div class="copy">{{ course_run.number }}</div>
</div>
<div class="info-item">
<div class="heading">
......@@ -21,7 +21,7 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% with object.lms_course_id as field %}
{% with course_run.lms_course_id as field %}
{% include "publisher/_render_required_field.html" %}
{% endwith %}
</div>
......@@ -32,7 +32,7 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% with object.short_description as field %}
{% with course_run.short_description as field %}
{% include "publisher/_render_required_field.html" %}
{% endwith %}
</div>
......@@ -42,7 +42,7 @@
{% trans "Organization" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.organization_key }}</div>
<div class="copy">{{ course_run.organization_key }}</div>
</div>
<div class="info-item">
......@@ -50,7 +50,7 @@
{% trans "MicroMasters" %}
</div>
<div>
{% with object.micromasters_name as field %}
{% with course_run.micromasters_name as field %}
{% include "publisher/_render_optional_field.html" %}
{% endwith %}
</div>
......@@ -62,8 +62,8 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% if object.is_xseries %}
{{ object.xseries_name }}
{% if course_run.is_xseries %}
{{ course_run.xseries_name }}
{% else %}
{% trans "(Optional) Not yet added" %}
{% endif %}
......@@ -75,7 +75,7 @@
{% trans "Professional Certificate Name" %}
</div>
<div>
{% with object.professional_certificate_name as field %}
{% with course_run.professional_certificate_name as field %}
{% include "publisher/_render_optional_field.html" %}
{% endwith %}
</div>
......@@ -86,20 +86,20 @@
{% trans "Start Date (time in UTC)" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.start|date:"Y-m-d" }}</div>
<div class="copy">{{ course_run.start|date:"Y-m-d" }}</div>
</div>
<div class="info-item">
<div class="heading">{% trans "End Date (time in UTC)" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.end|date:"Y-m-d" }}</div>
<div class="copy">{{ course_run.end|date:"Y-m-d" }}</div>
</div>
<div class="info-item">
<div class="heading">
{% trans "Self Paced" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.pacing_type }}</div>
<div class="copy">{{ course_run.pacing_type }}</div>
</div>
<div class="info-item">
<div class="heading">
......@@ -107,10 +107,10 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div>
{% if not object.course_staff %}
{% if not course_run.course_staff %}
{% trans "(Required) Not yet added" %}
{% else %}
{% for obj in object.course_staff %}
{% for obj in course_run.course_staff %}
<div class="course-staff">
<img src="{{ obj.image_url }}" alt=""/>
......@@ -136,12 +136,12 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% if object.min_effort and object.max_effort %}
{{ object.min_effort }} {% trans "to" %} {{ object.max_effort }} {% trans "hours per week" %}
{% elif object.min_effort %}
{{ object.min_effort }} {% trans "hours per week" %}
{% if course_run.min_effort and course_run.max_effort %}
{{ course_run.min_effort }} {% trans "to" %} {{ course_run.max_effort }} {% trans "hours per week" %}
{% elif course_run.min_effort %}
{{ course_run.min_effort }} {% trans "hours per week" %}
{% else %}
{% with object.estimated_effort as field %}
{% with course_run.estimated_effort as field %}
{% include "publisher/_render_required_field.html" %}
{% endwith %}
{% endif %}
......@@ -153,7 +153,7 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% with object.language.name as field %}
{% with course_run.language.name as field %}
{% include "publisher/_render_required_field.html" %}
{% endwith %}
</div>
......@@ -164,7 +164,7 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% with object.transcript_languages as field %}
{% with course_run.transcript_languages as field %}
{% include "publisher/_render_required_field.html" %}
{% endwith %}
</div>
......@@ -175,7 +175,7 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% with object.level_type as field %}
{% with course_run.level_type as field %}
{% include "publisher/_render_required_field.html" %}
{% endwith %}
</div>
......@@ -186,7 +186,7 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% with object.full_description as field %}
{% with course_run.full_description as field %}
{% include "publisher/_render_required_field.html" %}
{% endwith %}
</div>
......@@ -197,7 +197,7 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% with object.expected_learnings as field %}
{% with course_run.expected_learnings as field %}
{% include "publisher/_render_required_field.html" %}
{% endwith %}
</div>
......@@ -207,10 +207,10 @@
{% trans "Course Image" %}
</div>
<div>
{% if object.course.image %}
<img class="course-image" src="{{ object.course.image.url }}" alt="{% trans 'Course Image' %}">
{% if course_run.course.image %}
<img class="course-image" src="{{ course_run.course.image.url }}" alt="{% trans 'Course Image' %}">
<div class="download-image">
<a download href="{{ object.course.image.url }}">
<a download href="{{ course_run.course.image.url }}">
{% trans "Download" %}
</a>
</div>
......@@ -225,7 +225,7 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% with object.course.prerequisites as field %}
{% with course_run.course.prerequisites as field %}
{% include "publisher/_render_optional_field.html" %}
{% endwith %}
</div>
......@@ -236,7 +236,7 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% with object.keywords as field %}
{% with course_run.keywords as field %}
{% include "publisher/_render_optional_field.html" %}
{% endwith %}
</div>
......@@ -247,8 +247,8 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% if object.wrapped_obj.sponsor.all %}
{% for sponsor in object.wrapped_obj.sponsor.all %}
{% if course_run.wrapped_obj.sponsor.all %}
{% for sponsor in course_run.wrapped_obj.sponsor.all %}
{{ sponsor.name }}<br>
{% endfor %}
{% else %}
......@@ -263,7 +263,7 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% with object.syllabus as field %}
{% with course_run.syllabus as field %}
{% include "publisher/_render_optional_field.html" %}
{% endwith %}
</div>
......@@ -274,7 +274,7 @@
{% trans "Primary Subject" %}
</div>
<div>
{% with object.subjects.0 as field %}
{% with course_run.subjects.0 as field %}
{% include "publisher/_render_required_field.html" %}
{% endwith %}
</div>
......@@ -285,7 +285,7 @@
{% trans "Additional Subject" %}
</div>
<div>
{% with object.subjects.1 as field %}
{% with course_run.subjects.1 as field %}
{% include "publisher/_render_optional_field.html" %}
{% endwith %}
</div>
......@@ -296,7 +296,7 @@
{% trans "Additional Subject" %}
</div>
<div>
{% with object.subjects.2 as field %}
{% with course_run.subjects.2 as field %}
{% include "publisher/_render_optional_field.html" %}
{% endwith %}
</div>
......@@ -307,7 +307,7 @@
{% trans "Course Length (Weeks)" %}
</div>
<div>
{% with object.length as field %}
{% with course_run.length as field %}
{% include "publisher/_render_required_field.html" %}
{% endwith %}
</div>
......@@ -319,7 +319,7 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% with object.course.learner_testimonial as field %}
{% with course_run.course.learner_testimonial as field %}
{% include "publisher/_render_optional_field.html" %}
{% endwith %}
</div>
......@@ -330,7 +330,7 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% with object.course.faq as field %}
{% with course_run.course.faq as field %}
{% include "publisher/_render_optional_field.html" %}
{% endwith %}
</div>
......@@ -340,7 +340,7 @@
{% trans "Course About Video" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
{% with object.course.video_link as value %}
{% with course_run.course.video_link as value %}
{% if value %}
<a class="copy" href="{{ value }}" target="_blank">{{ value }}</a>
{% else %}
......@@ -356,8 +356,8 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% if object.wrapped_obj.seats.all %}
{% for seat in object.wrapped_obj.seats.all %}
{% if course_run.wrapped_obj.seats.all %}
{% for seat in course_run.wrapped_obj.seats.all %}
<span>{{ seat.type }}</span>
{% endfor %}
{% else %}
......
course_discovery/apps/publisher/templates/publisher/course_run_detail/_edit_warning.html
......@@ -8,13 +8,13 @@
<span class="sr-only">CAUTION</span>
<p>
<!-- Is "tasawer" in line 12 correct? -->
{% blocktrans trimmed with owner=object.course_run_state.owner_role reviewer_user='tasawer'%}
{% blocktrans trimmed with owner=course_run.course_run_state.owner_role reviewer_user='tasawer'%}
The {{ current_team_name }} is currently reviewing this course run. If you edit course run information, you might overwrite the team’s changes, and you will have to send the course run to the {{ team_name }} for review again.
{% endblocktrans %}
</p>
<div class="actions">
<a class="btn-cancel closeModal" href="#">{% trans "Cancel" %}</a>
<a class="btn-brand btn-base btn-accept" type="button" href="{% url 'publisher:publisher_course_runs_edit' object.id %}">{% trans "Edit" %}</a>
<a class="btn-brand btn-base btn-accept" type="button" href="{% url 'publisher:publisher_course_runs_edit' course_run.id %}">{% trans "Edit" %}</a>
</div>
</div>
</div>
course_discovery/apps/publisher/templates/publisher/course_run_detail/_preview_accept_popup.html
......@@ -17,7 +17,7 @@
</ul>
<div class="actions">
<a class="btn-cancel closeModal" href="#">{% trans "Cancel" %}</a>
<button class="btn-brand btn-base btn-accept" type="button" data-url="{% url 'publisher:api:change_course_run_state' object.course_run_state.id %}">{% trans "OK" %}</button>
<button class="btn-brand btn-base btn-accept" type="button" data-url="{% url 'publisher:api:change_course_run_state' course_run.course_run_state.id %}">{% trans "OK" %}</button>
</div>
</div>
</div>
course_discovery/apps/publisher/templates/publisher/course_run_detail/_salesforce.html
......@@ -8,33 +8,33 @@
{% trans "Title" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.title }}</div>
<div class="copy">{{ course_run.title }}</div>
</div>
<div class="info-item">
<div class="heading">
{% trans "Number" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.number }}</div>
<div class="copy">{{ course_run.number }}</div>
</div>
<div class="info-item">
<div class="heading">
{% trans "Account" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.organization_name }}</div>
<div class="copy">{{ course_run.organization_name }}</div>
</div>
<div class="info-item">
<div class="heading">
{% trans "Authored in Studio?" %}
</div>
<div class="copy">{{ object.is_authored_in_studio }}</div>
<div class="copy">{{ course_run.is_authored_in_studio }}</div>
</div>
<div class="info-item">
<div class="heading">
{% trans "Multiple Partner Course?" %}
</div>
<div class="copy">{{ object.is_multiple_partner_course }}</div>
<div class="copy">{{ course_run.is_multiple_partner_course }}</div>
</div>
<div class="info-item">
<div class="heading">
......@@ -42,7 +42,7 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% with object.level_type as field %}
{% with course_run.level_type as field %}
{% include "publisher/_render_required_field.html" %}
{% endwith %}
</div>
......@@ -53,7 +53,7 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% with object.course.primary_subject.name as field %}
{% with course_run.course.primary_subject.name as field %}
{% include "publisher/_render_required_field.html" %}
{% endwith %}
</div>
......@@ -64,7 +64,7 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% with object.language.name as field %}
{% with course_run.language.name as field %}
{% include "publisher/_render_required_field.html" %}
{% endwith %}
</div>
......@@ -75,7 +75,7 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% with object.transcript_languages as field %}
{% with course_run.transcript_languages as field %}
{% include "publisher/_render_required_field.html" %}
{% endwith %}
</div>
......@@ -86,7 +86,7 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% with object.video_language as field %}
{% with course_run.video_language as field %}
{% include "publisher/_render_required_field.html" %}
{% endwith %}
</div>
......@@ -99,7 +99,7 @@
<div class="heading">
{% trans "New or Rerun?" %}
</div>
<div class="copy">{{ object.is_re_run }}</div>
<div class="copy">{{ course_run.is_re_run }}</div>
</div>
<div class="info-item">
<div class="heading">
......@@ -114,10 +114,10 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% if not object.course_staff %}
{% if not course_run.course_staff %}
{% trans "(Required) Not yet added" %}
{% else %}
{% for obj in object.course_staff %}
{% for obj in course_run.course_staff %}
<div class="course-staff">
<img src="{{ obj.image_url }}" alt=""/>
......@@ -143,14 +143,14 @@
{% trans "Course Run Display Name" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.title }}</div>
<div class="copy">{{ course_run.title }}</div>
</div>
<div class="info-item">
<div class="heading">
{% trans "Course Run Number" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.number }}</div>
<div class="copy">{{ course_run.number }}</div>
</div>
<div class="info-item">
<div class="heading">
......@@ -158,7 +158,7 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% with object.lms_course_id as field %}
{% with course_run.lms_course_id as field %}
{% include "publisher/_render_required_field.html" %}
{% endwith %}
</div>
......@@ -168,7 +168,7 @@
{% trans "Certificate Type" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.course_type }}</div>
<div class="copy">{{ course_run.course_type }}</div>
</div>
<div class="info-item">
<div class="heading">
......@@ -176,7 +176,7 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% with object.seat_price as field %}
{% with course_run.seat_price as field %}
{% include "publisher/_render_optional_field.html" %}
{% endwith %}
</div>
......@@ -187,7 +187,7 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% with object.credit_seat_price as field %}
{% with course_run.credit_seat_price as field %}
{% include "publisher/_render_optional_field.html" %}
{% endwith %}
</div>
......@@ -196,7 +196,7 @@
<div class="heading">
{% trans "Self Paced?" %}
</div>
<div class="copy">{{ object.is_self_paced }}</div>
<div class="copy">{{ course_run.is_self_paced }}</div>
</div>
<div class="info-item">
<div class="heading">
......@@ -204,7 +204,7 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% with object.mdc_submission_due_date as field %}
{% with course_run.mdc_submission_due_date as field %}
{% include "publisher/_render_optional_field.html" %}
{% endwith %}
</div>
......@@ -214,14 +214,14 @@
{% trans "Start Date" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.start }}</div>
<div class="copy">{{ course_run.start }}</div>
</div>
<div class="info-item">
<div class="heading">
{% trans "End Date" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.end }}</div>
<div class="copy">{{ course_run.end }}</div>
</div>
<div class="info-item">
<div class="heading">
......@@ -229,7 +229,7 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% with object.verified_seat_expiry as field %}
{% with course_run.verified_seat_expiry as field %}
{% include "publisher/_render_optional_field.html" %}
{% endwith %}
</div>
......@@ -240,7 +240,7 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% with object.certificate_generation as field %}
{% with course_run.certificate_generation as field %}
{% include "publisher/_render_optional_field.html" %}
{% endwith %}
</div>
......
course_discovery/apps/publisher/templates/publisher/course_run_detail/_seats.html
{% load i18n %}
<h3 class="hd-4 seat-set-hd">Seats</h3>
{% if object.non_credit_seats %}
{% if course_run.non_credit_seats %}
<div class="seat-set">
<table class="table">
<tr>
......@@ -9,7 +9,7 @@
<th scope="col">{% trans "Currency" %}</th>
<th scope="col">{% trans "Upgrade Deadline (time in UTC)" %}</th>
</tr>
{% for seat in object.non_credit_seats %}
{% for seat in course_run.non_credit_seats %}
<tr>
<td>{{ seat.type}}</td>
<td>{{ seat.price}}</td>
......
course_discovery/apps/publisher/templates/publisher/course_run_detail/_studio.html
......@@ -7,21 +7,21 @@
{% trans "Course Name" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.title }} </div>
<div class="copy">{{ course_run.title }} </div>
</div>
<div class="info-item">
<div class="heading">
{% trans "Organization" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.organization_name }}</div>
<div class="copy">{{ course_run.organization_name }}</div>
</div>
<div class="info-item">
<div class="heading">
{% trans "Number" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.number }}</div>
<div class="copy">{{ course_run.number }}</div>
</div>
<div class="info-item">
......@@ -29,14 +29,14 @@
{% trans "Start Date (time in UTC)" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.start|date:"M d, Y, H:i:s A" }}</div>
<div class="copy">{{ course_run.start|date:"M d, Y, H:i:s A" }}</div>
</div>
<div class="info-item">
<div class="heading">
{% trans "End Date (time in UTC)" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.end|date:"M d, Y, H:i:s A" }}</div>
<div class="copy">{{ course_run.end|date:"M d, Y, H:i:s A" }}</div>
</div>
<div class="info-item">
<div class="heading">
......@@ -44,8 +44,8 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% if object.enrollment_start %}
{{ object.enrollment_start|date:"M d, Y, H:i:s A" }}
{% if course_run.enrollment_start %}
{{ course_run.enrollment_start|date:"M d, Y, H:i:s A" }}
{% else %}
{% trans "(Optional) Not yet added" %}
{% endif %}
......@@ -57,8 +57,8 @@
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">
{% if object.enrollment_end %}
{{ object.enrollment_end|date:"M d, Y, H:i:s A" }}
{% if course_run.enrollment_end %}
{{ course_run.enrollment_end|date:"M d, Y, H:i:s A" }}
{% else %}
{% trans "(Optional) Not yet added" %}
{% endif %}
......@@ -69,7 +69,7 @@
{% trans "Pacing Type" %}
{% include "publisher/course_run_detail/_clipboard.html" %}
</div>
<div class="copy">{{ object.pacing_type }}</div>
<div class="copy">{{ course_run.pacing_type }}</div>
</div>
</div>
<div class="clearfix"></div>
......
course_discovery/apps/publisher/templates/publisher/course_run_detail/_widgets.html
......@@ -2,7 +2,7 @@
<div class="course-widgets">
{% if can_edit %}
{% url 'publisher:publisher_course_runs_edit' pk=object.id as edit_page_url %}
{% url 'publisher:publisher_course_runs_edit' pk=course_run.id as edit_page_url %}
<a href="{% if add_warning_popup %}#{% else %}{{ edit_page_url }}{% endif %}" class="btn btn-neutral btn-courserun-edit">
{% trans "EDIT" %}
</a>
......
course_discovery/apps/publisher/templates/publisher/course_run_detail/course_run_detail.html
......@@ -5,25 +5,25 @@
{% load static %}
{% block title %}
{{ object.course.number }} - {{ object.start|date:'M Y' }}
{{ course_run.course.number }} - {{ course_run.start|date:'M Y' }}
{% endblock title %}
{% block page_content %}
<div class="layout-1t2t layout-flush publisher-container course-detail">
<main class="layout-col layout-col-b layout-col-b-custom">
{% if object.course_run_state.is_published %}
{% if course_run.course_run_state.is_published %}
<div class="depth depth-0 published-status">
<strong>
<!-- Is it possible to make "View it on edx.org" into a link? If so, make it into a link, add a period at the end, and delete "at". If not, keep "at", but remove the colon and add a period after the link. -->
{% blocktrans with publish_date|date:'m/d/y' as course_publish_date trimmed %}
The About page for this course run was published on {{ course_publish_date }}.
{% endblocktrans %}
{% if object.preview_url %}
{% if course_run.preview_url %}
{% trans "View it on edx.org at" %}
{% endif %}
</strong>
{% if object.preview_url %}
<a href="{{ object.preview_url }}" target="_blank">{{ object.preview_url }}</a>
{% if course_run.preview_url %}
<a href="{{ course_run.preview_url }}" target="_blank">{{ course_run.preview_url }}</a>
{% endif %}
</div>
{% endif %}
......@@ -45,12 +45,12 @@
<div id="app">
<div class="page-header">
<h2 class="hd-2 emphasized">
<span class="course-name">{{ object.title }}</span>
<span class="course-name">{{ course_run.title }}</span>
</h2>
</div>
{% if request.user.is_staff and object.lms_course_id %}
<button class="btn btn-primary" onclick="publish('{% url 'publisher:api:v1:course_run-publish' pk=object.pk %}');">{% trans "Publish" %}</button>
{% if request.user.is_staff and course_run.lms_course_id %}
<button class="btn btn-primary" onclick="publish('{% url 'publisher:api:v1:course_run-publish' pk=course_run.pk %}');">{% trans "Publish" %}</button>
{% endif %}
<div class="alert hidden" role="alert" aria-labelledby="alertTitle" tabindex="-1" id="alertContainer" style="margin:15px 0;">
......
course_discovery/apps/publisher/views.py
......@@ -166,7 +166,7 @@ class CourseRunDetailView(mixins.LoginRequiredMixin, mixins.PublisherPermissionM
user = self.request.user
course_run = CourseRunWrapper(self.get_object())
context['object'] = course_run
context['course_run'] = course_run
context['comment_object'] = course_run
# this URL is used for the comments post back redirection.
......@@ -227,6 +227,7 @@ class CourseRunDetailView(mixins.LoginRequiredMixin, mixins.PublisherPermissionM
context['team_name'] = (_('course team')
if current_owner_role.role == PublisherUserRole.ProjectCoordinator
else _('project coordinator'))
context['is_in_preview_review'] = course_run.is_in_preview_review
return context
......
course_discovery/apps/publisher/wrappers.py
......@@ -143,6 +143,14 @@ class CourseRunWrapper(BaseWrapper):
return Seat.AUDIT
@property
def is_in_preview_review(self):
return (
self.wrapped_obj.course_run_state.is_approved and not
self.wrapped_obj.course_run_state.is_preview_accepted and
self.wrapped_obj.course_run_state.owner_role == 'course_team'
)
@property
def organization_key(self):
organization = self.wrapped_obj.course.organizations.first()
if not organization:
......
course_discovery/apps/publisher_comments/models.py
......@@ -47,15 +47,9 @@ class Comments(CommentAbstractModel):
@transaction.atomic
def mark_preview_url_as_decline(instance):
course_run = instance.content_type.get_object_for_this_type(pk=instance.object_pk)
# remove the preview url
preview_url = course_run.preview_url
course_run.preview_url = None
course_run.save()
# assign course back to publisher
course_run.course_run_state.change_owner_role(PublisherUserRole.Publisher)
# send email for decline preview to publisher
if waffle.switch_is_active('enable_publisher_email_notifications'):
send_email_decline_preview(instance, course_run, preview_url)
send_email_decline_preview(instance, course_run, course_run.preview_url)
course_discovery/apps/publisher_comments/tests/test_emails.py
......@@ -224,7 +224,7 @@ class CommentsEmailTests(SiteMixin, TestCase):
)
self.assertIn(body, str(mail.outbox[0].body.strip()))
self.assertEqual(comment.comment_type, CommentTypeChoices.Decline_Preview)
self.assertFalse(CourseRun.objects.get(id=self.course_run.id).preview_url)
self.assertTrue(CourseRun.objects.get(id=self.course_run.id).preview_url)
def test_decline_preview_comment_with_role_back(self):
""" Verify that in case of any error transaction will roll back all changes."""
......
course_discovery/conf/locale/en/LC_MESSAGES/django.po
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-11-28 18:49+0000\n"
"POT-Creation-Date: 2017-11-30 13:11+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -1106,6 +1106,10 @@ msgid "Submitted for review"
msgstr ""
#: apps/publisher/templates/publisher/_approval_widget.html
msgid "Preview Declined"
msgstr ""
#: apps/publisher/templates/publisher/_approval_widget.html
#: apps/publisher/templates/publisher/seat_form.html
msgid "Save"
msgstr ""
......
course_discovery/conf/locale/en/LC_MESSAGES/djangojs.po
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-11-28 18:49+0000\n"
"POT-Creation-Date: 2017-11-30 13:11+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
course_discovery/conf/locale/eo/LC_MESSAGES/django.po
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-11-28 18:49+0000\n"
"POT-Creation-Date: 2017-11-30 13:11+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -1296,6 +1296,10 @@ msgid "Submitted for review"
msgstr "Süßmïttéd för révïéw Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #"
#: apps/publisher/templates/publisher/_approval_widget.html
msgid "Preview Declined"
msgstr "Prévïéw Déçlïnéd Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#"
#: apps/publisher/templates/publisher/_approval_widget.html
#: apps/publisher/templates/publisher/seat_form.html
msgid "Save"
msgstr "Sävé Ⱡ'σяєм ι#"
......
course_discovery/conf/locale/eo/LC_MESSAGES/djangojs.po
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-11-28 18:49+0000\n"
"POT-Creation-Date: 2017-11-30 13:11+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
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