Redstoner/redstoner.com
Archived
0
Fork 0
Code Issues Pull Requests 2 Wiki Activity

more fixes for order of threadreplies

Browse Source
This commit is contained in:
jomo
2017-07-07 02:05:04 +02:00
parent 72a6dcc54a
commit 8c6eb8ac17
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/forums_controller.rb
View File

@@ -11,7 +11,7 @@ class ForumsController < ApplicationController
@threads = @forum.forumthreads.select {|f| f.can_read?(current_user) }.to_a @threads = @forum.forumthreads.select {|f| f.can_read?(current_user) }.to_a
@threads.sort_by! do |t| @threads.sort_by! do |t|
# sticky goes first, then sort by last activity (new replies) # sticky goes first, then sort by last activity (new replies)
[t.sticky ? 0 : 1, -(t.replies.last.try(:created_at) || t.created_at).to_i] [t.sticky ? 0 : 1, -(t.replies.order(:id).last.try(:created_at) || t.created_at).to_i]
end end
@threads = Kaminari.paginate_array(@threads).page(params[:page]) @threads = Kaminari.paginate_array(@threads).page(params[:page])
end end

2
app/controllers/threadreplies_controller.rb
View File

@@ -37,7 +37,7 @@ class ThreadrepliesController < ApplicationController
if @reply.update_attributes(reply_params) if @reply.update_attributes(reply_params)
@reply.send_new_reply_mail(old_content) @reply.send_new_reply_mail(old_content)
flash[:notice] = "Reply updated!" flash[:notice] = "Reply updated!"
position = @reply.thread.replies.index(@reply) position = @reply.thread.replies.order(:id).index(@reply)
page = position / Kaminari.config.default_per_page + 1 page = position / Kaminari.config.default_per_page + 1
redirect_to forumthread_path(@reply.thread, page: page) + "#reply-#{@reply.id}" redirect_to forumthread_path(@reply.thread, page: page) + "#reply-#{@reply.id}"
else else

2
app/views/forums/show.html.erb
View File

@@ -38,7 +38,7 @@
<div class="item <%= "#{"locked" if thread.locked}#{"sticky" if thread.sticky}" %>"> <div class="item <%= "#{"locked" if thread.locked}#{"sticky" if thread.sticky}" %>">
<%= render partial: "labels/label", locals: {label: thread.label} %><%= link_to truncate(thread.title, length: 60, omission: " …"), forumthread_path(thread), title: thread.title %> <%= render partial: "labels/label", locals: {label: thread.label} %><%= link_to truncate(thread.title, length: 60, omission: " …"), forumthread_path(thread), title: thread.title %>
<div class="item-info"> <div class="item-info">
<% if rpl = thread.replies.last %> <% if rpl = thread.replies.order(:id).last %>
<%= rpl.author.name %> <%= rpl.author.name %>
<% <%
position = thread.replies.count - 1 position = thread.replies.count - 1

2
app/views/forumthreads/index.html.erb
View File

@@ -60,7 +60,7 @@
<div class="item <%= "#{"locked" if thread.locked}#{"sticky" if thread.sticky}" %>"> <div class="item <%= "#{"locked" if thread.locked}#{"sticky" if thread.sticky}" %>">
<%= render partial: "labels/label", locals: {label: thread.label} %><%= link_to truncate(thread.title, length: 60, omission: " …"), forumthread_path(thread), title: thread.title %> <%= render partial: "labels/label", locals: {label: thread.label} %><%= link_to truncate(thread.title, length: 60, omission: " …"), forumthread_path(thread), title: thread.title %>
<div class="item-info"> <div class="item-info">
<% if rpl = thread.replies.last %> <% if rpl = thread.replies.order(:id).last %>
<%= rpl.author.name %> <%= rpl.author.name %>
<% <%
position = thread.replies.count - 1 position = thread.replies.count - 1

2
app/views/threadreplies/edit.html.erb
View File

@@ -1,7 +1,7 @@
<% title "Edit Thread Reply: #{@reply.thread.title}" %> <% title "Edit Thread Reply: #{@reply.thread.title}" %>
<% <%
position = @reply.thread.replies.index(@reply) position = @reply.thread.replies.order(:id).index(@reply)
page = position / Kaminari.config.default_per_page + 1 page = position / Kaminari.config.default_per_page + 1
%> %>