Commit 8da65662 by Your Name

pinning started

parent 0769389d
...@@ -5,3 +5,4 @@ elasticsearch_server: <%= ENV['SEARCH_SERVER'] || 'http://localhost:9200' %> ...@@ -5,3 +5,4 @@ elasticsearch_server: <%= ENV['SEARCH_SERVER'] || 'http://localhost:9200' %>
cache_timeout: cache_timeout:
threads_search: 10 threads_search: 10
threads_query: 10 threads_query: 10
vote_juice_factor: 10 #when a faculty votes (the request has juice) add this vote count to content's vote count
...@@ -111,7 +111,7 @@ helpers do ...@@ -111,7 +111,7 @@ helpers do
else else
page = (params["page"] || DEFAULT_PAGE).to_i page = (params["page"] || DEFAULT_PAGE).to_i
per_page = (params["per_page"] || DEFAULT_PER_PAGE).to_i per_page = (params["per_page"] || DEFAULT_PER_PAGE).to_i
comment_threads = comment_threads.order_by("#{sort_key} #{sort_order}") if sort_key && sort_order comment_threads = comment_threads.order_by("pinned DESC, #{sort_key} #{sort_order}") if sort_key && sort_order
num_pages = [1, (comment_threads.count / per_page.to_f).ceil].max num_pages = [1, (comment_threads.count / per_page.to_f).ceil].max
page = [num_pages, [1, page].max].min page = [num_pages, [1, page].max].min
paged_comment_threads = comment_threads.page(page).per(per_page) paged_comment_threads = comment_threads.page(page).per(per_page)
......
...@@ -15,6 +15,7 @@ class Comment < Content ...@@ -15,6 +15,7 @@ class Comment < Content
field :anonymous, type: Boolean, default: false field :anonymous, type: Boolean, default: false
field :anonymous_to_peers, type: Boolean, default: false field :anonymous_to_peers, type: Boolean, default: false
field :at_position_list, type: Array, default: [] field :at_position_list, type: Array, default: []
field :pinned, type: Boolean
index({author_id: 1, course_id: 1}) index({author_id: 1, course_id: 1})
......
...@@ -22,6 +22,7 @@ class CommentThread < Content ...@@ -22,6 +22,7 @@ class CommentThread < Content
field :at_position_list, type: Array, default: [] field :at_position_list, type: Array, default: []
field :last_activity_at, type: Time field :last_activity_at, type: Time
field :group_id, type: Integer field :group_id, type: Integer
field :pinned, type: Boolean
index({author_id: 1, course_id: 1}) index({author_id: 1, course_id: 1})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment