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
dd625bfb
Commit
dd625bfb
authored
Mar 15, 2017
by
Waheed Ahmed
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Assign VIEW/EDIT permission to org/course-team group upon OrganizationExtension creation.
ECOM-7493
parent
ceaa3bfe
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
64 additions
and
2 deletions
+64
-2
course_discovery/apps/publisher/admin.py
+21
-1
course_discovery/apps/publisher/tests/test_admin.py
+43
-1
No files found.
course_discovery/apps/publisher/admin.py
View file @
dd625bfb
...
@@ -2,7 +2,9 @@ from django.contrib import admin
...
@@ -2,7 +2,9 @@ from django.contrib import admin
from
django.contrib.auth.admin
import
UserAdmin
from
django.contrib.auth.admin
import
UserAdmin
from
django.contrib.auth.models
import
Group
from
django.contrib.auth.models
import
Group
from
guardian.admin
import
GuardedModelAdmin
from
guardian.admin
import
GuardedModelAdmin
from
guardian.shortcuts
import
assign_perm
from
course_discovery.apps.publisher.constants
import
PROJECT_COORDINATOR_GROUP_NAME
,
REVIEWER_GROUP_NAME
from
course_discovery.apps.publisher.forms
import
(
CourseRunAdminForm
,
CourseUserRoleForm
,
OrganizationUserRoleForm
,
from
course_discovery.apps.publisher.forms
import
(
CourseRunAdminForm
,
CourseUserRoleForm
,
OrganizationUserRoleForm
,
PublisherUserCreationForm
,
UserAttributesAdminForm
)
PublisherUserCreationForm
,
UserAttributesAdminForm
)
from
course_discovery.apps.publisher.models
import
(
Course
,
CourseRun
,
CourseRunState
,
CourseState
,
CourseUserRole
,
from
course_discovery.apps.publisher.models
import
(
Course
,
CourseRun
,
CourseRunState
,
CourseState
,
CourseUserRole
,
...
@@ -18,7 +20,25 @@ class CourseUserRoleAdmin(admin.ModelAdmin):
...
@@ -18,7 +20,25 @@ class CourseUserRoleAdmin(admin.ModelAdmin):
@admin.register
(
OrganizationExtension
)
@admin.register
(
OrganizationExtension
)
class
OrganizationExtensionAdmin
(
GuardedModelAdmin
):
class
OrganizationExtensionAdmin
(
GuardedModelAdmin
):
pass
def
save_model
(
self
,
request
,
obj
,
form
,
change
):
obj
.
save
()
# Assign EDIT/VIEW permissions to organization group.
permissions
=
[
OrganizationExtension
.
VIEW_COURSE
,
OrganizationExtension
.
EDIT_COURSE
,
OrganizationExtension
.
VIEW_COURSE_RUN
,
OrganizationExtension
.
EDIT_COURSE_RUN
]
for
permission
in
permissions
:
assign_perm
(
permission
,
obj
.
group
,
obj
)
# Assign EDIT_COURSE permission to Marketing Reviewers group.
assign_perm
(
OrganizationExtension
.
EDIT_COURSE
,
Group
.
objects
.
get
(
name
=
REVIEWER_GROUP_NAME
),
obj
)
# Assign EDIT_COURSE_RUN permission to Project Coordinators group.
assign_perm
(
OrganizationExtension
.
EDIT_COURSE_RUN
,
Group
.
objects
.
get
(
name
=
PROJECT_COORDINATOR_GROUP_NAME
),
obj
)
@admin.register
(
UserAttributes
)
@admin.register
(
UserAttributes
)
...
...
course_discovery/apps/publisher/tests/test_admin.py
View file @
dd625bfb
import
ddt
import
ddt
from
django.contrib.auth.models
import
Group
from
django.core.urlresolvers
import
reverse
from
django.core.urlresolvers
import
reverse
from
django.test
import
TestCase
from
django.test
import
TestCase
from
guardian.shortcuts
import
get_group_perms
from
course_discovery.apps.core.tests.factories
import
UserFactory
from
course_discovery.apps.core.tests.factories
import
UserFactory
from
course_discovery.apps.course_metadata.tests.factories
import
OrganizationFactory
from
course_discovery.apps.publisher.constants
import
PROJECT_COORDINATOR_GROUP_NAME
,
REVIEWER_GROUP_NAME
from
course_discovery.apps.publisher.forms
import
CourseRunAdminForm
from
course_discovery.apps.publisher.forms
import
CourseRunAdminForm
from
course_discovery.apps.publisher.models
import
CourseRun
from
course_discovery.apps.publisher.models
import
CourseRun
,
OrganizationExtension
from
course_discovery.apps.publisher.tests
import
factories
from
course_discovery.apps.publisher.tests
import
factories
USER_PASSWORD
=
'password'
USER_PASSWORD
=
'password'
...
@@ -73,3 +77,41 @@ class AdminTests(TestCase):
...
@@ -73,3 +77,41 @@ class AdminTests(TestCase):
""" Verify page loads successfully."""
""" Verify page loads successfully."""
response
=
self
.
client
.
get
(
url
)
response
=
self
.
client
.
get
(
url
)
self
.
assertEqual
(
response
.
status_code
,
200
)
self
.
assertEqual
(
response
.
status_code
,
200
)
class
OrganizationExtensionAdminTests
(
TestCase
):
""" Tests for OrganizationExtensionAdmin."""
def
setUp
(
self
):
super
(
OrganizationExtensionAdminTests
,
self
)
.
setUp
()
self
.
user
=
UserFactory
(
is_staff
=
True
,
is_superuser
=
True
)
self
.
client
.
login
(
username
=
self
.
user
.
username
,
password
=
USER_PASSWORD
)
self
.
run_state
=
factories
.
CourseRunStateFactory
()
self
.
admin_page_url
=
reverse
(
'admin:publisher_organizationextension_add'
)
def
test_organization_extension_permission
(
self
):
"""
Verify that required permissions assigned to OrganizationExtension object.
"""
test_organization
=
OrganizationFactory
()
test_group
=
factories
.
GroupFactory
()
post_data
=
{
'organization'
:
test_organization
.
id
,
'group'
:
test_group
.
id
}
self
.
client
.
post
(
self
.
admin_page_url
,
data
=
post_data
)
organization_extension
=
OrganizationExtension
.
objects
.
get
(
organization
=
test_organization
,
group
=
test_group
)
expected_permissions
=
[
OrganizationExtension
.
VIEW_COURSE
,
OrganizationExtension
.
EDIT_COURSE
,
OrganizationExtension
.
VIEW_COURSE_RUN
,
OrganizationExtension
.
EDIT_COURSE_RUN
]
course_team_permissions
=
get_group_perms
(
test_group
,
organization_extension
)
self
.
assertEqual
(
sorted
(
course_team_permissions
),
sorted
(
expected_permissions
))
marketing_permissions
=
get_group_perms
(
Group
.
objects
.
get
(
name
=
REVIEWER_GROUP_NAME
),
organization_extension
)
self
.
assertEqual
(
list
(
marketing_permissions
),
[
OrganizationExtension
.
EDIT_COURSE
])
pc_permissions
=
get_group_perms
(
Group
.
objects
.
get
(
name
=
PROJECT_COORDINATOR_GROUP_NAME
),
organization_extension
)
self
.
assertEqual
(
list
(
pc_permissions
),
[
OrganizationExtension
.
EDIT_COURSE_RUN
])
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