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
90f37b33
Commit
90f37b33
authored
Sep 17, 2012
by
Arjun Singh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't use the search API to retrieve all threads.
parent
7801fe0c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
21 deletions
+14
-21
lms/djangoapps/django_comment_client/forum/views.py
+0
-20
lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
+14
-1
lms/templates/discussion/_accordion.html
+0
-0
No files found.
lms/djangoapps/django_comment_client/forum/views.py
View file @
90f37b33
...
...
@@ -28,26 +28,6 @@ PAGES_NEARBY_DELTA = 2
escapedict
=
{
'"'
:
'"'
}
log
=
logging
.
getLogger
(
"edx.discussions"
)
def
_general_discussion_id
(
course_id
):
return
course_id
.
replace
(
'/'
,
'_'
)
.
replace
(
'.'
,
'_'
)
def
_should_perform_search
(
request
):
return
bool
(
request
.
GET
.
get
(
'text'
,
False
)
or
\
request
.
GET
.
get
(
'tags'
,
False
))
def
render_accordion
(
request
,
course
,
discussion_id
):
# TODO: Delete if obsolete
discussion_info
=
utils
.
get_categorized_discussion_info
(
request
,
course
)
context
=
{
'course'
:
course
,
'discussion_info'
:
discussion_info
,
'active'
:
discussion_id
,
'csrf'
:
csrf
(
request
)[
'csrf_token'
],
}
return
render_to_string
(
'discussion/_accordion.html'
,
context
)
def
get_threads
(
request
,
course_id
,
discussion_id
=
None
,
per_page
=
THREADS_PER_PAGE
):
"""
This may raise cc.utils.CommentClientError or
...
...
lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
View file @
90f37b33
...
...
@@ -244,7 +244,8 @@ if Backbone?
item
=
$
(
event
.
target
).
closest
(
'li'
)
if
item
.
find
(
"span.board-name"
).
data
(
"discussion_id"
)
==
"#all"
@
discussionIds
=
""
@
clearSearch
()
@
$
(
".post-search-field"
).
val
(
""
)
@
retrieveAllThreads
()
else
discussionIds
=
_
.
map
item
.
find
(
".board-name[data-discussion_id]"
),
(
board
)
->
$
(
board
).
data
(
"discussion_id"
).
id
@
retrieveDiscussions
(
discussionIds
)
...
...
@@ -277,6 +278,18 @@ if Backbone?
Content
.
loadContentInfos
(
response
.
content_info
)
@
displayedCollection
.
reset
(
@
collection
.
models
)
retrieveAllThreads
:
()
->
url
=
DiscussionUtil
.
urlFor
(
"threads"
)
DiscussionUtil
.
safeAjax
url
:
url
type
:
"GET"
success
:
(
response
,
textStatus
)
=>
@
collection
.
current_page
=
response
.
page
@
collection
.
pages
=
response
.
num_pages
@
collection
.
reset
(
response
.
discussion_data
)
Content
.
loadContentInfos
(
response
.
content_info
)
@
displayedCollection
.
reset
(
@
collection
.
models
)
sortThreads
:
(
event
)
->
@
$
(
".sort-bar a"
).
removeClass
(
"active"
)
$
(
event
.
target
).
addClass
(
"active"
)
...
...
lms/templates/discussion/_accordion.html
deleted
100644 → 0
View file @
7801fe0c
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