Commit 6d1b800b by Waheed Ahmed

Removed CourseTeam from organization role dropdown choices.

LEARNER-810
parent ba23d48a
...@@ -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 PublisherUserRole(DjangoChoices): class InternalUserRole(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'))
......
# -*- 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'),
),
]
...@@ -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=PublisherUserRole.choices, verbose_name=_('Organization Role') max_length=63, choices=InternalUserRole.choices, verbose_name=_('Organization Role')
) )
history = HistoricalRecords() history = HistoricalRecords()
......
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