Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
course-discovery
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
course-discovery
Commits
286c9dad
Commit
286c9dad
authored
Apr 12, 2018
by
asadazam93
Committed by
AsadAzam
Apr 13, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed course declined status on dashboard
parent
7b0c0e8b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
1 deletions
+17
-1
course_discovery/apps/publisher/templates/publisher/dashboard/_in_preview.html
+1
-1
course_discovery/apps/publisher/tests/test_wrapper.py
+12
-0
course_discovery/apps/publisher/wrappers.py
+4
-0
No files found.
course_discovery/apps/publisher/templates/publisher/dashboard/_in_preview.html
View file @
286c9dad
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
<td
data-order=
"{{ course_run.owner_role_modified|date:"
Y-m-d
"
}}"
>
<td
data-order=
"{{ course_run.owner_role_modified|date:"
Y-m-d
"
}}"
>
{% if course_run.course_run_state.preview_accepted %}
{% if course_run.course_run_state.preview_accepted %}
{% trans "Approved since " %}
{% trans "Approved since " %}
{% elif course_run.preview_declined and
not course_run.preview_url
%}
{% elif course_run.preview_declined and
course_run.owner_role_is_publisher
%}
{% trans "Declined since " %}
{% trans "Declined since " %}
{% elif not course_run.preview_url %}
{% elif not course_run.preview_url %}
{% trans "Preview Requested since " %}
{% trans "Preview Requested since " %}
...
...
course_discovery/apps/publisher/tests/test_wrapper.py
View file @
286c9dad
...
@@ -225,6 +225,18 @@ class CourseRunWrapperTests(TestCase):
...
@@ -225,6 +225,18 @@ class CourseRunWrapperTests(TestCase):
course_run_state
.
change_owner_role
(
PublisherUserRole
.
CourseTeam
)
course_run_state
.
change_owner_role
(
PublisherUserRole
.
CourseTeam
)
assert
self
.
wrapped_course_run
.
course_team_status
==
'Awaiting Course Team Review'
assert
self
.
wrapped_course_run
.
course_team_status
==
'Awaiting Course Team Review'
def
test_owner_role_is_publisher
(
self
):
"""
Verify that owner_role_is_publisher returns true if owner is publisher and false otherwise
"""
course_run_state
=
factories
.
CourseRunStateFactory
(
course_run
=
self
.
course_run
,
owner_role
=
PublisherUserRole
.
Publisher
)
self
.
assertEqual
(
self
.
wrapped_course_run
.
owner_role_is_publisher
,
True
)
course_run_state
.
change_owner_role
(
PublisherUserRole
.
CourseTeam
)
self
.
assertEqual
(
self
.
wrapped_course_run
.
owner_role_is_publisher
,
False
)
def
test_internal_user_status
(
self
):
def
test_internal_user_status
(
self
):
"""
"""
Verify that internal_user_status returns right statuses.
Verify that internal_user_status returns right statuses.
...
...
course_discovery/apps/publisher/wrappers.py
View file @
286c9dad
...
@@ -264,6 +264,10 @@ class CourseRunWrapper(BaseWrapper):
...
@@ -264,6 +264,10 @@ class CourseRunWrapper(BaseWrapper):
return
self
.
ApprovedByProjectCoordinator
return
self
.
ApprovedByProjectCoordinator
@property
@property
def
owner_role_is_publisher
(
self
):
return
self
.
wrapped_obj
.
course_run_state
.
owner_role
==
PublisherUserRole
.
Publisher
@property
def
owner_role_modified
(
self
):
def
owner_role_modified
(
self
):
return
self
.
wrapped_obj
.
course_run_state
.
owner_role_modified
return
self
.
wrapped_obj
.
course_run_state
.
owner_role_modified
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment