Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
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
edx-platform
Commits
a92910db
Commit
a92910db
authored
May 06, 2013
by
Chris Dodge
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update lms to reflect where comment models.py is now in common
parent
ae9d13b5
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
14 additions
and
30 deletions
+14
-30
lms/djangoapps/django_comment_client/base/views.py
+1
-1
lms/djangoapps/django_comment_client/management/commands/assign_role.py
+1
-1
lms/djangoapps/django_comment_client/management/commands/assign_roles_for_course.py
+1
-1
lms/djangoapps/django_comment_client/management/commands/create_roles_for_existing.py
+1
-1
lms/djangoapps/django_comment_client/management/commands/seed_permissions_roles.py
+2
-19
lms/djangoapps/django_comment_client/management/commands/show_permissions.py
+1
-1
lms/djangoapps/django_comment_client/permissions.py
+1
-1
lms/djangoapps/django_comment_client/tests.py
+1
-1
lms/djangoapps/django_comment_client/tests/test_models.py
+1
-1
lms/djangoapps/django_comment_client/tests/test_utils.py
+1
-1
lms/djangoapps/django_comment_client/utils.py
+1
-1
lms/djangoapps/instructor/views.py
+1
-1
lms/envs/common.py
+1
-0
No files found.
lms/djangoapps/django_comment_client/base/views.py
View file @
a92910db
...
...
@@ -26,7 +26,7 @@ from course_groups.cohorts import get_cohort_id, is_commentable_cohorted
from
django_comment_client.utils
import
JsonResponse
,
JsonError
,
extract
,
get_courseware_context
from
django_comment_client.permissions
import
check_permissions_by_view
,
cached_has_permission
from
django_comment_c
lient
.models
import
Role
from
django_comment_c
ommon
.models
import
Role
log
=
logging
.
getLogger
(
__name__
)
...
...
lms/djangoapps/django_comment_client/management/commands/assign_role.py
View file @
a92910db
from
optparse
import
make_option
from
django.core.management.base
import
BaseCommand
,
CommandError
from
django_comment_c
lient
.models
import
Role
from
django_comment_c
ommon
.models
import
Role
from
django.contrib.auth.models
import
User
...
...
lms/djangoapps/django_comment_client/management/commands/assign_roles_for_course.py
View file @
a92910db
...
...
@@ -7,7 +7,7 @@ Enrollments.
from
django.core.management.base
import
BaseCommand
,
CommandError
from
student.models
import
CourseEnrollment
from
django_comment_c
lient
.models
import
assign_default_role
from
django_comment_c
ommon
.models
import
assign_default_role
class
Command
(
BaseCommand
):
...
...
lms/djangoapps/django_comment_client/management/commands/create_roles_for_existing.py
View file @
a92910db
...
...
@@ -7,7 +7,7 @@ Enrollments.
from
django.core.management.base
import
BaseCommand
,
CommandError
from
student.models
import
CourseEnrollment
from
django_comment_c
lient
.models
import
assign_default_role
from
django_comment_c
ommon
.models
import
assign_default_role
class
Command
(
BaseCommand
):
...
...
lms/djangoapps/django_comment_client/management/commands/seed_permissions_roles.py
View file @
a92910db
from
django.core.management.base
import
BaseCommand
,
CommandError
from
django_comment_c
lient.models
import
Role
from
django_comment_c
ommon.utils
import
seed_permissions_roles
class
Command
(
BaseCommand
):
...
...
@@ -18,21 +18,4 @@ class Command(BaseCommand):
community_ta_role
=
Role
.
objects
.
get_or_create
(
name
=
"Community TA"
,
course_id
=
course_id
)[
0
]
student_role
=
Role
.
objects
.
get_or_create
(
name
=
"Student"
,
course_id
=
course_id
)[
0
]
for
per
in
[
"vote"
,
"update_thread"
,
"follow_thread"
,
"unfollow_thread"
,
"update_comment"
,
"create_sub_comment"
,
"unvote"
,
"create_thread"
,
"follow_commentable"
,
"unfollow_commentable"
,
"create_comment"
,
]:
student_role
.
add_permission
(
per
)
for
per
in
[
"edit_content"
,
"delete_thread"
,
"openclose_thread"
,
"endorse_comment"
,
"delete_comment"
,
"see_all_cohorts"
]:
moderator_role
.
add_permission
(
per
)
for
per
in
[
"manage_moderator"
]:
administrator_role
.
add_permission
(
per
)
moderator_role
.
inherit_permissions
(
student_role
)
# For now, Community TA == Moderator, except for the styling.
community_ta_role
.
inherit_permissions
(
moderator_role
)
administrator_role
.
inherit_permissions
(
moderator_role
)
seed_permissions_roles
(
course_id
)
lms/djangoapps/django_comment_client/management/commands/show_permissions.py
View file @
a92910db
from
django.core.management.base
import
BaseCommand
,
CommandError
from
django_comment_c
lient
.models
import
Permission
,
Role
from
django_comment_c
ommon
.models
import
Permission
,
Role
from
django.contrib.auth.models
import
User
...
...
lms/djangoapps/django_comment_client/permissions.py
View file @
a92910db
from
.models
import
Role
,
Permission
from
django_comment_common
.models
import
Role
,
Permission
from
django.db.models.signals
import
post_save
from
django.dispatch
import
receiver
from
student.models
import
CourseEnrollment
...
...
lms/djangoapps/django_comment_client/tests.py
View file @
a92910db
...
...
@@ -6,7 +6,7 @@ from django.test import TestCase
from
student.models
import
CourseEnrollment
from
django_comment_client.permissions
import
has_permission
from
django_comment_c
lient
.models
import
Role
from
django_comment_c
ommon
.models
import
Role
class
PermissionsTestCase
(
TestCase
):
...
...
lms/djangoapps/django_comment_client/tests/test_models.py
View file @
a92910db
import
django_comment_client.models
as
models
import
django_comment_c
lient
.permissions
as
permissions
import
django_comment_c
ommon
.permissions
as
permissions
from
django.test
import
TestCase
...
...
lms/djangoapps/django_comment_client/tests/test_utils.py
View file @
a92910db
...
...
@@ -2,7 +2,7 @@ from django.test import TestCase
from
factory
import
DjangoModelFactory
from
student.tests.factories
import
UserFactory
,
CourseEnrollmentFactory
from
django_comment_c
lient
.models
import
Role
,
Permission
from
django_comment_c
ommon
.models
import
Role
,
Permission
import
django_comment_client.utils
as
utils
...
...
lms/djangoapps/django_comment_client/utils.py
View file @
a92910db
...
...
@@ -13,7 +13,7 @@ from django.core.urlresolvers import reverse
from
django.db
import
connection
from
django.http
import
HttpResponse
from
django.utils
import
simplejson
from
django_comment_c
lient
.models
import
Role
from
django_comment_c
ommon
.models
import
Role
from
django_comment_client.permissions
import
check_permissions_by_view
from
xmodule.modulestore.exceptions
import
NoPathToItem
...
...
lms/djangoapps/instructor/views.py
View file @
a92910db
...
...
@@ -27,7 +27,7 @@ from courseware.access import (has_access, get_access_group_name,
course_beta_test_group_name
)
from
courseware.courses
import
get_course_with_access
from
courseware.models
import
StudentModule
from
django_comment_c
lient
.models
import
(
Role
,
from
django_comment_c
ommon
.models
import
(
Role
,
FORUM_ROLE_ADMINISTRATOR
,
FORUM_ROLE_MODERATOR
,
FORUM_ROLE_COMMUNITY_TA
)
...
...
lms/envs/common.py
View file @
a92910db
...
...
@@ -592,5 +592,6 @@ INSTALLED_APPS = (
# Discussion forums
'django_comment_client'
,
'django_comment_common'
,
)
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