Added new role Partner Manager (PM) and its group.

ECOM-6545

Added new role Partner Manager (PM) and its group.
ECOM-6545
2409cbdd · Waheed Ahmed · 4e80415d · 2409cbdd · 2409cbdd · 2409cbdd
Commit 2409cbdd authored Jan 19, 2017 by Waheed Ahmed
14 changed files
--- a/course_discovery/apps/publisher/api/tests/test_views.py
+++ b/course_discovery/apps/publisher/api/tests/test_views.py
@@ -32,11 +32,8 @@ class CourseRoleAssignmentViewTests(TestCase):
        self.internal_user_group = Group.objects.get(name=INTERNAL_USER_GROUP_NAME)

        self.internal_user_group.user_set.add(self.internal_user)
-        self.other_internal_users = []
-        for __ in range(3):
-            user = UserFactory()
-            self.other_internal_users.append(user)
-            self.internal_user_group.user_set.add(user)
+        self.other_internal_users = UserFactory.create_batch(4)
+        self.internal_user_group.user_set.add(*self.other_internal_users)

        self.organization_extension = factories.OrganizationExtensionFactory()
        self.course.organizations.add(self.organization_extension.organization)
@@ -130,6 +127,7 @@ class CourseRoleAssignmentViewTests(TestCase):
        return self.course.course_user_roles.all()

    @ddt.data(
+        PublisherUserRole.PartnerManager,
        PublisherUserRole.PartnerCoordinator,
        PublisherUserRole.MarketingReviewer,
        PublisherUserRole.Publisher

--- a/course_discovery/apps/publisher/choices.py
+++ b/course_discovery/apps/publisher/choices.py
@@ -3,6 +3,7 @@ from djchoices import DjangoChoices, ChoiceItem


 class PublisherUserRole(DjangoChoices):
+    PartnerManager = ChoiceItem('partner_manager', _('Partner Manager'))
    PartnerCoordinator = ChoiceItem('partner_coordinator', _('Partner Coordinator'))
    MarketingReviewer = ChoiceItem('marketing_reviewer', _('Marketing Reviewer'))
    Publisher = ChoiceItem('publisher', _('Publisher'))

--- a/course_discovery/apps/publisher/constants.py
+++ b/course_discovery/apps/publisher/constants.py
 # Name of the administrative group for the Publisher app
 ADMIN_GROUP_NAME = 'Publisher Admins'
 INTERNAL_USER_GROUP_NAME = 'Internal Users'
+PARTNER_MANAGER_GROUP_NAME = 'Partner Managers'
 PARTNER_COORDINATOR_GROUP_NAME = 'Partner Coordinators'
 REVIEWER_GROUP_NAME = 'Marketing Reviewers'
 PUBLISHER_GROUP_NAME = 'Publishers'
--- a/course_discovery/apps/publisher/migrations/0028_create_partner_manager_group.py
+++ b/course_discovery/apps/publisher/migrations/0028_create_partner_manager_group.py
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+from course_discovery.apps.publisher.constants import PARTNER_MANAGER_GROUP_NAME
+
+
+def create_partner_manager_group(apps, schema_editor):
+    Group = apps.get_model('auth', 'Group')
+    Group.objects.get_or_create(name=PARTNER_MANAGER_GROUP_NAME)
+
+
+def remove_partner_manager_group(apps, schema_editor):
+    Group = apps.get_model('auth', 'Group')
+    Group.objects.filter(name=PARTNER_MANAGER_GROUP_NAME).delete()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('publisher', '0027_remove_old_permissions'),
+        ('auth', '0006_require_contenttypes_0002'),
+    ]
+
+    operations = [
+        migrations.RunPython(create_partner_manager_group, remove_partner_manager_group)
+    ]
--- a/course_discovery/apps/publisher/migrations/0029_auto_20170119_0934.py
+++ b/course_discovery/apps/publisher/migrations/0029_auto_20170119_0934.py
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.11 on 2017-01-19 09:34
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('publisher', '0028_create_partner_manager_group'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='courseuserrole',
+            name='role',
+            field=models.CharField(choices=[('partner_manager', 'Partner Manager'), ('partner_coordinator', 'Partner Coordinator'), ('marketing_reviewer', 'Marketing Reviewer'), ('publisher', 'Publisher'), ('course_team', 'Course Team')], max_length=63, verbose_name='Course Role'),
+        ),
+        migrations.AlterField(
+            model_name='historicalcourseuserrole',
+            name='role',
+            field=models.CharField(choices=[('partner_manager', 'Partner Manager'), ('partner_coordinator', 'Partner Coordinator'), ('marketing_reviewer', 'Marketing Reviewer'), ('publisher', 'Publisher'), ('course_team', 'Course Team')], max_length=63, verbose_name='Course Role'),
+        ),
+        migrations.AlterField(
+            model_name='historicalorganizationuserrole',
+            name='role',
+            field=models.CharField(choices=[('partner_manager', 'Partner Manager'), ('partner_coordinator', 'Partner Coordinator'), ('marketing_reviewer', 'Marketing Reviewer'), ('publisher', 'Publisher'), ('course_team', 'Course Team')], max_length=63, verbose_name='Organization Role'),
+        ),
+        migrations.AlterField(
+            model_name='organizationuserrole',
+            name='role',
+            field=models.CharField(choices=[('partner_manager', 'Partner Manager'), ('partner_coordinator', 'Partner Coordinator'), ('marketing_reviewer', 'Marketing Reviewer'), ('publisher', 'Publisher'), ('course_team', 'Course Team')], max_length=63, verbose_name='Organization Role'),
+        ),
+    ]
--- a/course_discovery/apps/publisher/views.py
+++ b/course_discovery/apps/publisher/views.py
@@ -39,6 +39,7 @@ logger = logging.getLogger(__name__)
 SEATS_HIDDEN_FIELDS = ['price', 'currency', 'upgrade_deadline', 'credit_provider', 'credit_hours']

 ROLE_WIDGET_HEADINGS = {
+    PublisherUserRole.PartnerManager: _('PARTNER MANAGER'),
    PublisherUserRole.PartnerCoordinator: _('PARTNER COORDINATOR'),
    PublisherUserRole.MarketingReviewer: _('MARKETING'),
    PublisherUserRole.Publisher: _('PUBLISHER'),

--- a/course_discovery/conf/locale/en/LC_MESSAGES/django.mo
+++ b/course_discovery/conf/locale/en/LC_MESSAGES/django.mo
--- a/course_discovery/conf/locale/en/LC_MESSAGES/django.po
+++ b/course_discovery/conf/locale/en/LC_MESSAGES/django.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-18 11:20-0500\n"
+"POT-Creation-Date: 2017-01-20 11:48+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"

 #: apps/api/filters.py
 #, python-brace-format
@@ -422,6 +422,10 @@ msgstr ""
 msgid "Invalid course key \"{lms_course_id}\""
 msgstr ""

+#: apps/publisher/choices.py
+msgid "Partner Manager"
+msgstr ""
+
 #: apps/publisher/choices.py templates/publisher/courses.html
 msgid "Partner Coordinator"
 msgstr ""
@@ -660,6 +664,10 @@ msgstr ""
 msgid "Course Role"
 msgstr ""

+#: apps/publisher/views.py templates/publisher/add_course_form.html
+msgid "PARTNER MANAGER"
+msgstr ""
+
 #: apps/publisher/views.py
 msgid "PARTNER COORDINATOR"
 msgstr ""
@@ -879,10 +887,6 @@ msgid ""
 msgstr ""

 #: templates/publisher/add_course_form.html
-msgid "PARTNER MANAGER"
-msgstr ""
-
-#: templates/publisher/add_course_form.html
 msgid ""
 "EdX recommends that you contact a partner manager before you begin to plan a"
 " new course. "

--- a/course_discovery/conf/locale/en/LC_MESSAGES/djangojs.mo
+++ b/course_discovery/conf/locale/en/LC_MESSAGES/djangojs.mo
--- a/course_discovery/conf/locale/en/LC_MESSAGES/djangojs.po
+++ b/course_discovery/conf/locale/en/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-18 12:59+0500\n"
+"POT-Creation-Date: 2017-01-20 11:48+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

--- a/course_discovery/conf/locale/eo/LC_MESSAGES/django.mo
+++ b/course_discovery/conf/locale/eo/LC_MESSAGES/django.mo
--- a/course_discovery/conf/locale/eo/LC_MESSAGES/django.po
+++ b/course_discovery/conf/locale/eo/LC_MESSAGES/django.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-18 11:20-0500\n"
+"POT-Creation-Date: 2017-01-20 11:48+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

 #: apps/api/filters.py
@@ -530,6 +530,10 @@ msgstr ""
 msgid "Invalid course key \"{lms_course_id}\""
 msgstr "Ìnvälïd çöürsé kéý \"{lms_course_id}\" Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢ση#"

+#: apps/publisher/choices.py
+msgid "Partner Manager"
+msgstr "Pärtnér Mänägér Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α#"
+
 #: apps/publisher/choices.py templates/publisher/courses.html
 msgid "Partner Coordinator"
 msgstr "Pärtnér Çöördïnätör Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт,#"
@@ -786,6 +790,10 @@ msgstr "Örgänïzätïön Rölé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α
 msgid "Course Role"
 msgstr "Çöürsé Rölé Ⱡ'σяєм ιρѕυм ∂σłσя #"

+#: apps/publisher/views.py templates/publisher/add_course_form.html
+msgid "PARTNER MANAGER"
+msgstr "PÀRTNÉR MÀNÀGÉR Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α#"
+
 #: apps/publisher/views.py
 msgid "PARTNER COORDINATOR"
 msgstr "PÀRTNÉR ÇÖÖRDÌNÀTÖR Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт,#"
@@ -1041,10 +1049,6 @@ msgstr ""
 "çöürsé rün. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢#"

 #: templates/publisher/add_course_form.html
-msgid "PARTNER MANAGER"
-msgstr "PÀRTNÉR MÀNÀGÉR Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α#"
-
-#: templates/publisher/add_course_form.html
 msgid ""
 "EdX recommends that you contact a partner manager before you begin to plan a"
 " new course. "

--- a/course_discovery/conf/locale/eo/LC_MESSAGES/djangojs.mo
+++ b/course_discovery/conf/locale/eo/LC_MESSAGES/djangojs.mo
--- a/course_discovery/conf/locale/eo/LC_MESSAGES/djangojs.po
+++ b/course_discovery/conf/locale/eo/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-18 12:59+0500\n"
+"POT-Creation-Date: 2017-01-20 11:48+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"