Commit 77a8cac9 by Waheed Ahmed

Fixed created_by and reviewed status when run is published.

parent 6afded19
...@@ -271,7 +271,11 @@ class CourseRun(TimeStampedModel, ChangedByMixin): ...@@ -271,7 +271,11 @@ class CourseRun(TimeStampedModel, ChangedByMixin):
@property @property
def created_by(self): def created_by(self):
return self.history.order_by('history_date').first().history_user # pylint: disable=no-member history_user = self.history.order_by('history_date').first().history_user # pylint: disable=no-member
if history_user:
return history_user.get_full_name() or history_user.username
return
@property @property
def studio_url(self): def studio_url(self):
......
...@@ -49,7 +49,7 @@ class CourseRunTests(TestCase): ...@@ -49,7 +49,7 @@ class CourseRunTests(TestCase):
history_object.history_user = user history_object.history_user = user
history_object.save() history_object.save()
self.assertEqual(self.course_run.created_by, user) self.assertEqual(self.course_run.created_by, user.get_full_name())
def test_studio_url(self): def test_studio_url(self):
""" Verify that property returns studio url. """ """ Verify that property returns studio url. """
......
...@@ -728,7 +728,8 @@ def get_course_role_widgets_data(user, course, state_object, change_state_url, p ...@@ -728,7 +728,8 @@ def get_course_role_widgets_data(user, course, state_object, change_state_url, p
role_widget['button_disabled'] = True role_widget['button_disabled'] = True
if course_role.role in roles: if course_role.role in roles:
if state_object.name == CourseStateChoices.Approved and course_role.role == state_object.approved_by_role: reviewed_states = [CourseStateChoices.Approved, CourseRunStateChoices.Published]
if state_object.name in reviewed_states and course_role.role == state_object.approved_by_role:
history_record = state_object.history.filter( history_record = state_object.history.filter(
name=CourseStateChoices.Approved name=CourseStateChoices.Approved
).order_by('-modified').first() ).order_by('-modified').first()
......
...@@ -141,13 +141,3 @@ ...@@ -141,13 +141,3 @@
display: block; display: block;
} }
} }
#progress {
max-width: 100%;
overflow-x: auto;
.dataTables_wrapper {
@include padding-right(20px);
width: 120%;
}
}
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
{% for course_run in course.course_runs %} {% for course_run in course.course_runs %}
<div class="layout-1t2t layout-reversed course-run-item"> <div class="layout-1t2t layout-reversed course-run-item">
<div class="layout-col layout-col-a created-by"> <div class="layout-col layout-col-a created-by">
{% blocktrans with created_date=course_run.created.date created_time=course_run.created.time created_by=course_run.created_by.full_name %} {% blocktrans with created_date=course_run.created.date created_time=course_run.created.time created_by=course_run.created_by %}
Created {{ created_date }} at {{ created_time }} by {{ created_by }} Created {{ created_date }} at {{ created_time }} by {{ created_by }}
{% endblocktrans %} {% endblocktrans %}
</div> </div>
......
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