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
6d1b800b
Commit
6d1b800b
authored
May 11, 2017
by
Waheed Ahmed
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed CourseTeam from organization role dropdown choices.
LEARNER-810
parent
ba23d48a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
3 deletions
+32
-3
course_discovery/apps/publisher/choices.py
+4
-1
course_discovery/apps/publisher/migrations/0048_auto_20170511_1059.py
+25
-0
course_discovery/apps/publisher/models.py
+3
-2
No files found.
course_discovery/apps/publisher/choices.py
View file @
6d1b800b
...
@@ -2,11 +2,14 @@ from django.utils.translation import ugettext_lazy as _
...
@@ -2,11 +2,14 @@ from django.utils.translation import ugettext_lazy as _
from
djchoices
import
ChoiceItem
,
DjangoChoices
from
djchoices
import
ChoiceItem
,
DjangoChoices
class
Publisher
UserRole
(
DjangoChoices
):
class
Internal
UserRole
(
DjangoChoices
):
PartnerManager
=
ChoiceItem
(
'partner_manager'
,
_
(
'Partner Manager'
))
PartnerManager
=
ChoiceItem
(
'partner_manager'
,
_
(
'Partner Manager'
))
ProjectCoordinator
=
ChoiceItem
(
'project_coordinator'
,
_
(
'Project Coordinator'
))
ProjectCoordinator
=
ChoiceItem
(
'project_coordinator'
,
_
(
'Project Coordinator'
))
MarketingReviewer
=
ChoiceItem
(
'marketing_reviewer'
,
_
(
'Marketing Reviewer'
))
MarketingReviewer
=
ChoiceItem
(
'marketing_reviewer'
,
_
(
'Marketing Reviewer'
))
Publisher
=
ChoiceItem
(
'publisher'
,
_
(
'Publisher'
))
Publisher
=
ChoiceItem
(
'publisher'
,
_
(
'Publisher'
))
class
PublisherUserRole
(
InternalUserRole
):
CourseTeam
=
ChoiceItem
(
'course_team'
,
_
(
'Course Team'
))
CourseTeam
=
ChoiceItem
(
'course_team'
,
_
(
'Course Team'
))
...
...
course_discovery/apps/publisher/migrations/0048_auto_20170511_1059.py
0 → 100644
View file @
6d1b800b
# -*- coding: utf-8 -*-
# Generated by Django 1.9.13 on 2017-05-11 10:59
from
__future__
import
unicode_literals
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'publisher'
,
'0047_auto_20170413_1010'
),
]
operations
=
[
migrations
.
AlterField
(
model_name
=
'historicalorganizationuserrole'
,
name
=
'role'
,
field
=
models
.
CharField
(
choices
=
[(
'partner_manager'
,
'Partner Manager'
),
(
'project_coordinator'
,
'Project Coordinator'
),
(
'marketing_reviewer'
,
'Marketing Reviewer'
),
(
'publisher'
,
'Publisher'
)],
max_length
=
63
,
verbose_name
=
'Organization Role'
),
),
migrations
.
AlterField
(
model_name
=
'organizationuserrole'
,
name
=
'role'
,
field
=
models
.
CharField
(
choices
=
[(
'partner_manager'
,
'Partner Manager'
),
(
'project_coordinator'
,
'Project Coordinator'
),
(
'marketing_reviewer'
,
'Marketing Reviewer'
),
(
'publisher'
,
'Publisher'
)],
max_length
=
63
,
verbose_name
=
'Organization Role'
),
),
]
course_discovery/apps/publisher/models.py
View file @
6d1b800b
...
@@ -20,7 +20,8 @@ from course_discovery.apps.course_metadata.models import LevelType, Organization
...
@@ -20,7 +20,8 @@ from course_discovery.apps.course_metadata.models import LevelType, Organization
from
course_discovery.apps.course_metadata.utils
import
UploadToFieldNamePath
from
course_discovery.apps.course_metadata.utils
import
UploadToFieldNamePath
from
course_discovery.apps.ietf_language_tags.models
import
LanguageTag
from
course_discovery.apps.ietf_language_tags.models
import
LanguageTag
from
course_discovery.apps.publisher
import
emails
from
course_discovery.apps.publisher
import
emails
from
course_discovery.apps.publisher.choices
import
CourseRunStateChoices
,
CourseStateChoices
,
PublisherUserRole
from
course_discovery.apps.publisher.choices
import
(
CourseRunStateChoices
,
CourseStateChoices
,
InternalUserRole
,
PublisherUserRole
)
from
course_discovery.apps.publisher.utils
import
is_email_notification_enabled
from
course_discovery.apps.publisher.utils
import
is_email_notification_enabled
from
course_discovery.apps.publisher.validators
import
ImageSizeValidator
from
course_discovery.apps.publisher.validators
import
ImageSizeValidator
...
@@ -390,7 +391,7 @@ class OrganizationUserRole(TimeStampedModel):
...
@@ -390,7 +391,7 @@ class OrganizationUserRole(TimeStampedModel):
organization
=
models
.
ForeignKey
(
Organization
,
related_name
=
'organization_user_roles'
)
organization
=
models
.
ForeignKey
(
Organization
,
related_name
=
'organization_user_roles'
)
user
=
models
.
ForeignKey
(
User
,
related_name
=
'organization_user_roles'
)
user
=
models
.
ForeignKey
(
User
,
related_name
=
'organization_user_roles'
)
role
=
models
.
CharField
(
role
=
models
.
CharField
(
max_length
=
63
,
choices
=
Publisher
UserRole
.
choices
,
verbose_name
=
_
(
'Organization Role'
)
max_length
=
63
,
choices
=
Internal
UserRole
.
choices
,
verbose_name
=
_
(
'Organization Role'
)
)
)
history
=
HistoricalRecords
()
history
=
HistoricalRecords
()
...
...
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