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
4f47ea74
Commit
4f47ea74
authored
Jul 05, 2018
by
Cole Rogers
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added Credit Pathway model and a test
parent
2c7ebc6a
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
77 additions
and
4 deletions
+77
-4
course_discovery/apps/course_metadata/migrations/0085_auto_20180706_0029.py
+33
-0
course_discovery/apps/course_metadata/models.py
+14
-0
course_discovery/apps/course_metadata/tests/factories.py
+9
-0
course_discovery/apps/course_metadata/tests/test_models.py
+9
-0
course_discovery/conf/locale/en/LC_MESSAGES/django.mo
+0
-0
course_discovery/conf/locale/en/LC_MESSAGES/django.po
+5
-1
course_discovery/conf/locale/en/LC_MESSAGES/djangojs.mo
+0
-0
course_discovery/conf/locale/en/LC_MESSAGES/djangojs.po
+1
-1
course_discovery/conf/locale/eo/LC_MESSAGES/django.mo
+0
-0
course_discovery/conf/locale/eo/LC_MESSAGES/django.po
+5
-1
course_discovery/conf/locale/eo/LC_MESSAGES/djangojs.mo
+0
-0
course_discovery/conf/locale/eo/LC_MESSAGES/djangojs.po
+1
-1
No files found.
course_discovery/apps/course_metadata/migrations/0085_auto_20180706_0029.py
0 → 100644
View file @
4f47ea74
# -*- coding: utf-8 -*-
# Generated by Django 1.11.11 on 2018-07-06 00:29
from
__future__
import
unicode_literals
import
django_extensions.db.fields
import
sortedm2m.fields
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'course_metadata'
,
'0084_auto_20180522_1339'
),
]
operations
=
[
migrations
.
CreateModel
(
name
=
'CreditPathway'
,
fields
=
[
(
'id'
,
models
.
AutoField
(
auto_created
=
True
,
primary_key
=
True
,
serialize
=
False
,
verbose_name
=
'ID'
)),
(
'created'
,
django_extensions
.
db
.
fields
.
CreationDateTimeField
(
auto_now_add
=
True
,
verbose_name
=
'created'
)),
(
'modified'
,
django_extensions
.
db
.
fields
.
ModificationDateTimeField
(
auto_now
=
True
,
verbose_name
=
'modified'
)),
(
'name'
,
models
.
CharField
(
max_length
=
255
)),
(
'org_name'
,
models
.
CharField
(
max_length
=
255
,
verbose_name
=
'Organization name'
)),
(
'email'
,
models
.
EmailField
(
max_length
=
255
)),
(
'programs'
,
sortedm2m
.
fields
.
SortedManyToManyField
(
help_text
=
None
,
to
=
'course_metadata.Program'
)),
],
),
migrations
.
AlterUniqueTogether
(
name
=
'creditpathway'
,
unique_together
=
set
([(
'name'
,
'org_name'
)]),
),
]
course_discovery/apps/course_metadata/models.py
View file @
4f47ea74
...
@@ -1274,6 +1274,20 @@ class Program(TimeStampedModel):
...
@@ -1274,6 +1274,20 @@ class Program(TimeStampedModel):
super
(
Program
,
self
)
.
save
(
*
args
,
**
kwargs
)
super
(
Program
,
self
)
.
save
(
*
args
,
**
kwargs
)
class
CreditPathway
(
TimeStampedModel
):
""" Credit Pathway model """
name
=
models
.
CharField
(
max_length
=
255
)
org_name
=
models
.
CharField
(
max_length
=
255
,
verbose_name
=
_
(
"Organization name"
))
email
=
models
.
EmailField
(
max_length
=
255
)
programs
=
SortedManyToManyField
(
Program
)
def
__str__
(
self
):
return
"{org_name}: {name}"
.
format
(
org_name
=
self
.
org_name
,
name
=
self
.
name
)
class
Meta
(
object
):
unique_together
=
(
'name'
,
'org_name'
)
class
PersonSocialNetwork
(
AbstractSocialNetworkModel
):
class
PersonSocialNetwork
(
AbstractSocialNetworkModel
):
""" Person Social Network model. """
""" Person Social Network model. """
person
=
models
.
ForeignKey
(
Person
,
related_name
=
'person_networks'
)
person
=
models
.
ForeignKey
(
Person
,
related_name
=
'person_networks'
)
...
...
course_discovery/apps/course_metadata/tests/factories.py
View file @
4f47ea74
...
@@ -331,6 +331,15 @@ class ProgramFactory(factory.django.DjangoModelFactory):
...
@@ -331,6 +331,15 @@ class ProgramFactory(factory.django.DjangoModelFactory):
add_m2m_data
(
self
.
instructor_ordering
,
extracted
)
add_m2m_data
(
self
.
instructor_ordering
,
extracted
)
class
CreditPathwayFactory
(
factory
.
DjangoModelFactory
):
name
=
FuzzyText
()
org_name
=
FuzzyText
()
email
=
factory
.
Sequence
(
lambda
n
:
'test-email-{}@test.com'
.
format
(
n
))
# pylint: disable=unnecessary-lambda
class
Meta
:
model
=
CreditPathway
class
AbstractSocialNetworkModelFactory
(
factory
.
DjangoModelFactory
):
class
AbstractSocialNetworkModelFactory
(
factory
.
DjangoModelFactory
):
type
=
FuzzyChoice
([
name
for
name
,
__
in
AbstractSocialNetworkModel
.
SOCIAL_NETWORK_CHOICES
])
type
=
FuzzyChoice
([
name
for
name
,
__
in
AbstractSocialNetworkModel
.
SOCIAL_NETWORK_CHOICES
])
value
=
FuzzyText
()
value
=
FuzzyText
()
...
...
course_discovery/apps/course_metadata/tests/test_models.py
View file @
4f47ea74
...
@@ -1110,6 +1110,15 @@ class ProgramTests(TestCase):
...
@@ -1110,6 +1110,15 @@ class ProgramTests(TestCase):
assert
mock_delete_obj
.
called
assert
mock_delete_obj
.
called
class
CreditPathwayTests
(
TestCase
):
""" Tests of the CreditPathway model."""
def
test_str
(
self
):
credit_pathway
=
factories
.
CreditPathwayFactory
()
self
.
assertEqual
(
str
(
credit_pathway
),
'{org_name}: {name}'
.
format
(
org_name
=
credit_pathway
.
org_name
,
name
=
credit_pathway
.
name
))
class
PersonSocialNetworkTests
(
TestCase
):
class
PersonSocialNetworkTests
(
TestCase
):
"""Tests of the PersonSocialNetwork model."""
"""Tests of the PersonSocialNetwork model."""
...
...
course_discovery/conf/locale/en/LC_MESSAGES/django.mo
View file @
4f47ea74
No preview for this file type
course_discovery/conf/locale/en/LC_MESSAGES/django.po
View file @
4f47ea74
...
@@ -8,7 +8,7 @@ msgid ""
...
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
msgstr ""
"Project-Id-Version: edx-platform\n"
"Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-07-0
5 12:03
+0000\n"
"POT-Creation-Date: 2018-07-0
6 12:57
+0000\n"
"PO-Revision-Date: 2018-04-09 20:13+0000\n"
"PO-Revision-Date: 2018-04-09 20:13+0000\n"
"Last-Translator: Muhammad Ayub khan <ayubkhan@edx.org>\n"
"Last-Translator: Muhammad Ayub khan <ayubkhan@edx.org>\n"
"Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
"Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
...
@@ -493,6 +493,10 @@ msgid ""
...
@@ -493,6 +493,10 @@ msgid ""
"have a detail page."
"have a detail page."
msgstr ""
msgstr ""
#: apps/course_metadata/models.py:1280
msgid "Organization name"
msgstr ""
#: apps/course_metadata/templates/admin/course_metadata/course_run.html:24
#: apps/course_metadata/templates/admin/course_metadata/course_run.html:24
#: apps/publisher/templates/publisher/_add_instructor_popup.html:96
#: apps/publisher/templates/publisher/_add_instructor_popup.html:96
#: apps/publisher/templates/publisher/_revert_confirmation.html:13
#: apps/publisher/templates/publisher/_revert_confirmation.html:13
...
...
course_discovery/conf/locale/en/LC_MESSAGES/djangojs.mo
View file @
4f47ea74
No preview for this file type
course_discovery/conf/locale/en/LC_MESSAGES/djangojs.po
View file @
4f47ea74
...
@@ -8,7 +8,7 @@ msgid ""
...
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
msgstr ""
"Project-Id-Version: edx-platform\n"
"Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-07-0
5 12:03
+0000\n"
"POT-Creation-Date: 2018-07-0
6 12:57
+0000\n"
"PO-Revision-Date: 2018-04-09 20:13+0000\n"
"PO-Revision-Date: 2018-04-09 20:13+0000\n"
"Last-Translator: Muhammad Ayub khan <ayubkhan@edx.org>\n"
"Last-Translator: Muhammad Ayub khan <ayubkhan@edx.org>\n"
"Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
"Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
...
...
course_discovery/conf/locale/eo/LC_MESSAGES/django.mo
View file @
4f47ea74
No preview for this file type
course_discovery/conf/locale/eo/LC_MESSAGES/django.po
View file @
4f47ea74
...
@@ -8,7 +8,7 @@ msgid ""
...
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
msgstr ""
"Project-Id-Version: edx-platform\n"
"Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-07-0
5 12:03
+0000\n"
"POT-Creation-Date: 2018-07-0
6 12:57
+0000\n"
"PO-Revision-Date: 2018-04-09 20:13+0000\n"
"PO-Revision-Date: 2018-04-09 20:13+0000\n"
"Last-Translator: Muhammad Ayub khan <ayubkhan@edx.org>\n"
"Last-Translator: Muhammad Ayub khan <ayubkhan@edx.org>\n"
"Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
"Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
...
@@ -634,6 +634,10 @@ msgstr ""
...
@@ -634,6 +634,10 @@ msgstr ""
"Hïdé prögräm ön märkétïng sïté ländïng änd séärçh pägés. Thïs prögräm MÀÝ "
"Hïdé prögräm ön märkétïng sïté ländïng änd séärçh pägés. Thïs prögräm MÀÝ "
"hävé ä détäïl pägé. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σ#"
"hävé ä détäïl pägé. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σ#"
#: apps/course_metadata/models.py
msgid "Organization name"
msgstr "Örgänïzätïön nämé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмє#"
#: apps/course_metadata/templates/admin/course_metadata/course_run.html
#: apps/course_metadata/templates/admin/course_metadata/course_run.html
#: apps/publisher/templates/publisher/_add_instructor_popup.html
#: apps/publisher/templates/publisher/_add_instructor_popup.html
#: apps/publisher/templates/publisher/_revert_confirmation.html
#: apps/publisher/templates/publisher/_revert_confirmation.html
...
...
course_discovery/conf/locale/eo/LC_MESSAGES/djangojs.mo
View file @
4f47ea74
No preview for this file type
course_discovery/conf/locale/eo/LC_MESSAGES/djangojs.po
View file @
4f47ea74
...
@@ -8,7 +8,7 @@ msgid ""
...
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
msgstr ""
"Project-Id-Version: edx-platform\n"
"Project-Id-Version: edx-platform\n"
"Report-Msgid-Bugs-To: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-07-0
5 12:03
+0000\n"
"POT-Creation-Date: 2018-07-0
6 12:57
+0000\n"
"PO-Revision-Date: 2018-04-09 20:13+0000\n"
"PO-Revision-Date: 2018-04-09 20:13+0000\n"
"Last-Translator: Muhammad Ayub khan <ayubkhan@edx.org>\n"
"Last-Translator: Muhammad Ayub khan <ayubkhan@edx.org>\n"
"Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
"Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
...
...
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