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
7994e1b3
Commit
7994e1b3
authored
Apr 22, 2013
by
Your Name
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pep8 fixes
parent
0a627bb5
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
25 additions
and
25 deletions
+25
-25
lms/djangoapps/django_comment_client/base/views.py
+14
-13
lms/djangoapps/django_comment_client/forum/views.py
+0
-3
lms/djangoapps/django_comment_client/management/commands/reload_forum_users.py
+2
-3
lms/djangoapps/django_comment_client/tests/test_mustache_helpers.py
+0
-1
lms/djangoapps/django_comment_client/utils.py
+3
-3
lms/lib/comment_client/comment.py
+2
-0
lms/lib/comment_client/thread.py
+4
-2
No files found.
lms/djangoapps/django_comment_client/base/views.py
View file @
7994e1b3
...
...
@@ -174,7 +174,7 @@ def _create_comment(request, course_id, thread_id=None, parent_id=None):
user
=
cc
.
User
.
from_django_user
(
request
.
user
)
user
.
follow
(
comment
.
thread
)
if
request
.
is_ajax
():
return
ajax_content_response
(
request
,
course_id
,
comment
.
to_dict
(),
'discussion/ajax_create_comment.html'
)
return
ajax_content_response
(
request
,
course_id
,
comment
.
to_dict
(),
'discussion/ajax_create_comment.html'
)
else
:
return
JsonResponse
(
utils
.
safe_content
(
comment
.
to_dict
()))
...
...
@@ -290,9 +290,10 @@ def vote_for_thread(request, course_id, thread_id, value):
def
flag_abuse_for_thread
(
request
,
course_id
,
thread_id
):
user
=
cc
.
User
.
from_django_user
(
request
.
user
)
thread
=
cc
.
Thread
.
find
(
thread_id
)
thread
.
flagAbuse
(
user
,
thread
)
thread
.
flagAbuse
(
user
,
thread
)
return
JsonResponse
(
utils
.
safe_content
(
thread
.
to_dict
()))
@require_POST
@login_required
@permitted
...
...
@@ -301,18 +302,20 @@ def un_flag_abuse_for_thread(request, course_id, thread_id):
thread
=
cc
.
Thread
.
find
(
thread_id
)
removeAll
=
cached_has_permission
(
request
.
user
,
'openclose_thread'
,
course_id
)
thread
.
unFlagAbuse
(
user
,
thread
,
removeAll
)
thread
.
unFlagAbuse
(
user
,
thread
,
removeAll
)
return
JsonResponse
(
utils
.
safe_content
(
thread
.
to_dict
()))
@require_POST
@login_required
@permitted
def
flag_abuse_for_comment
(
request
,
course_id
,
comment_id
):
user
=
cc
.
User
.
from_django_user
(
request
.
user
)
comment
=
cc
.
Comment
.
find
(
comment_id
)
comment
.
flagAbuse
(
user
,
comment
)
comment
.
flagAbuse
(
user
,
comment
)
return
JsonResponse
(
utils
.
safe_content
(
comment
.
to_dict
()))
@require_POST
@login_required
@permitted
...
...
@@ -320,9 +323,10 @@ def un_flag_abuse_for_comment(request, course_id, comment_id):
user
=
cc
.
User
.
from_django_user
(
request
.
user
)
removeAll
=
cached_has_permission
(
request
.
user
,
'openclose_thread'
,
course_id
)
comment
=
cc
.
Comment
.
find
(
comment_id
)
comment
.
unFlagAbuse
(
user
,
comment
,
removeAll
)
comment
.
unFlagAbuse
(
user
,
comment
,
removeAll
)
return
JsonResponse
(
utils
.
safe_content
(
comment
.
to_dict
()))
@require_POST
@login_required
@permitted
...
...
@@ -332,19 +336,21 @@ def undo_vote_for_thread(request, course_id, thread_id):
user
.
unvote
(
thread
)
return
JsonResponse
(
utils
.
safe_content
(
thread
.
to_dict
()))
@require_POST
@login_required
@permitted
def
pin_thread
(
request
,
course_id
,
thread_id
):
user
=
cc
.
User
.
from_django_user
(
request
.
user
)
thread
=
cc
.
Thread
.
find
(
thread_id
)
thread
.
pin
(
user
,
thread_id
)
thread
.
pin
(
user
,
thread_id
)
return
JsonResponse
(
utils
.
safe_content
(
thread
.
to_dict
()))
def
un_pin_thread
(
request
,
course_id
,
thread_id
):
user
=
cc
.
User
.
from_django_user
(
request
.
user
)
thread
=
cc
.
Thread
.
find
(
thread_id
)
thread
.
un_pin
(
user
,
thread_id
)
thread
.
un_pin
(
user
,
thread_id
)
return
JsonResponse
(
utils
.
safe_content
(
thread
.
to_dict
()))
...
...
@@ -495,12 +501,7 @@ def upload(request, course_id): # ajax upload file to a question or answer
raise
exceptions
.
PermissionDenied
(
msg
)
# generate new file name
new_file_name
=
str
(
time
.
time
()
)
.
replace
(
'.'
,
str
(
random
.
randint
(
0
,
100000
))
)
+
file_extension
new_file_name
=
str
(
time
.
time
())
.
replace
(
'.'
,
str
(
random
.
randint
(
0
,
100000
)))
+
file_extension
file_storage
=
get_storage_class
()()
# use default storage to store file
...
...
lms/djangoapps/django_comment_client/forum/views.py
View file @
7994e1b3
...
...
@@ -303,9 +303,6 @@ def single_thread(request, course_id, discussion_id, thread_id):
cohorted_commentables
=
get_cohorted_commentables
(
course_id
)
user_cohort
=
get_cohort_id
(
request
.
user
,
course_id
)
context
=
{
'discussion_id'
:
discussion_id
,
'csrf'
:
csrf
(
request
)[
'csrf_token'
],
...
...
lms/djangoapps/django_comment_client/management/commands/reload_forum_users.py
View file @
7994e1b3
...
...
@@ -6,10 +6,11 @@ from django.core.management.base import BaseCommand, CommandError
from
django.contrib.auth.models
import
User
import
comment_client
as
cc
class
Command
(
BaseCommand
):
help
=
'Reload forum (comment client) users from existing users'
def
adduser
(
self
,
user
):
def
adduser
(
self
,
user
):
print
user
try
:
cc_user
=
cc
.
User
.
from_django_user
(
user
)
...
...
@@ -26,4 +27,3 @@ class Command(BaseCommand):
for
user
in
uset
:
self
.
adduser
(
user
)
\ No newline at end of file
lms/djangoapps/django_comment_client/tests/test_mustache_helpers.py
View file @
7994e1b3
...
...
@@ -39,4 +39,3 @@ class CloseThreadTextTest(TestCase):
self
.
assertEqual
(
mustache_helpers
.
close_thread_text
(
self
.
contentOpen
),
'Close thread'
)
#########################################################################################
lms/djangoapps/django_comment_client/utils.py
View file @
7994e1b3
...
...
@@ -187,8 +187,7 @@ def initialize_discussion_info(course):
category
=
" / "
.
join
([
x
.
strip
()
for
x
in
category
.
split
(
"/"
)])
last_category
=
category
.
split
(
"/"
)[
-
1
]
discussion_id_map
[
id
]
=
{
"location"
:
module
.
location
,
"title"
:
last_category
+
" / "
+
title
}
unexpanded_category_map
[
category
]
.
append
({
"title"
:
title
,
"id"
:
id
,
"sort_key"
:
sort_key
,
"start_date"
:
module
.
lms
.
start
})
unexpanded_category_map
[
category
]
.
append
({
"title"
:
title
,
"id"
:
id
,
"sort_key"
:
sort_key
,
"start_date"
:
module
.
lms
.
start
})
category_map
=
{
"entries"
:
defaultdict
(
dict
),
"subcategories"
:
defaultdict
(
dict
)}
for
category_path
,
entries
in
unexpanded_category_map
.
items
():
...
...
@@ -331,6 +330,7 @@ def get_annotated_content_infos(course_id, thread, user, user_info):
Get metadata for a thread and its children
"""
infos
=
{}
def
annotate
(
content
):
infos
[
str
(
content
[
'id'
])]
=
get_annotated_content_info
(
course_id
,
content
,
user
,
user_info
)
for
child
in
content
.
get
(
'children'
,
[]):
...
...
@@ -395,7 +395,7 @@ def get_courseware_context(content, course):
location
=
id_map
[
id
][
"location"
]
.
url
()
title
=
id_map
[
id
][
"title"
]
url
=
reverse
(
'jump_to'
,
kwargs
=
{
"course_id"
:
course
.
location
.
course_id
,
url
=
reverse
(
'jump_to'
,
kwargs
=
{
"course_id"
:
course
.
location
.
course_id
,
"location"
:
location
})
content_info
=
{
"courseware_url"
:
url
,
"courseware_title"
:
title
}
...
...
lms/lib/comment_client/comment.py
View file @
7994e1b3
...
...
@@ -76,8 +76,10 @@ def _url_for_thread_comments(thread_id):
def
_url_for_comment
(
comment_id
):
return
"{prefix}/comments/{comment_id}"
.
format
(
prefix
=
settings
.
PREFIX
,
comment_id
=
comment_id
)
def
_url_for_flag_abuse_comment
(
comment_id
):
return
"{prefix}/comments/{comment_id}/abuse_flags"
.
format
(
prefix
=
settings
.
PREFIX
,
comment_id
=
comment_id
)
def
_url_for_unflag_abuse_comment
(
comment_id
):
return
"{prefix}/comments/{comment_id}/abuse_unflags"
.
format
(
prefix
=
settings
.
PREFIX
,
comment_id
=
comment_id
)
lms/lib/comment_client/thread.py
View file @
7994e1b3
...
...
@@ -11,7 +11,6 @@ class Thread(models.Model):
'created_at'
,
'updated_at'
,
'comments_count'
,
'unread_comments_count'
,
'at_position_list'
,
'children'
,
'type'
,
'highlighted_title'
,
'highlighted_body'
,
'endorsed'
,
'read'
,
'group_id'
,
'group_name'
,
'pinned'
,
'abuse_flaggers'
]
updatable_fields
=
[
...
...
@@ -120,15 +119,18 @@ class Thread(models.Model):
request
=
perform_request
(
'put'
,
url
,
params
)
self
.
update_attributes
(
request
)
def
_url_for_flag_abuse_thread
(
thread_id
):
return
"{prefix}/threads/{thread_id}/abuse_flags"
.
format
(
prefix
=
settings
.
PREFIX
,
thread_id
=
thread_id
)
def
_url_for_unflag_abuse_thread
(
thread_id
):
return
"{prefix}/threads/{thread_id}/abuse_unflags"
.
format
(
prefix
=
settings
.
PREFIX
,
thread_id
=
thread_id
)
def
_url_for_pin_thread
(
thread_id
):
return
"{prefix}/threads/{thread_id}/pin"
.
format
(
prefix
=
settings
.
PREFIX
,
thread_id
=
thread_id
)
def
_url_for_un_pin_thread
(
thread_id
):
return
"{prefix}/threads/{thread_id}/unpin"
.
format
(
prefix
=
settings
.
PREFIX
,
thread_id
=
thread_id
)
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