jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

.

This commit is contained in:
yuanke 2016-11-09 14:15:37 +08:00
parent 59e6495610
commit 10f810960e
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/api/mobile/entities/issue.rb
View File

@ -24,8 +24,8 @@ module Mobile
IssueStatus.find(issue.status_id).name IssueStatus.find(issue.status_id).name
when :comment_count when :comment_count
issue.journals.where("notes is not null and notes != ''").count issue.journals.where("notes is not null and notes != ''").count
# all_comments = [] # all_comments = []
# get_all_children(all_comments, f).count # get_all_children(all_comments, f).count
when :project_name when :project_name
issue.project.name issue.project.name
when :praise_count when :praise_count
@ -99,7 +99,8 @@ module Mobile
if f.is_a?(::Issue) if f.is_a?(::Issue)
# f.journals_for_messages.reverse # f.journals_for_messages.reverse
if !opt[:children] && opt[:type] == 0 if !opt[:children] && opt[:type] == 0
opt[:children] = true #opt[:children] = true
opt.merge({:children=>true})
tStart = opt[:page]*5 tStart = opt[:page]*5
tEnd = (opt[:page]+1)*5 - 1 tEnd = (opt[:page]+1)*5 - 1
@ -135,7 +136,8 @@ module Mobile
# opt[:bottom] = true # opt[:bottom] = true
# parents_reply[opt[:page]..opt[:page]] # parents_reply[opt[:page]..opt[:page]]
else else
opt[:bottom] = true #opt[:bottom] = true
opt.merge({:bottom=>true})
parents_reply[0..0] parents_reply[0..0]
end end
else else
@ -151,7 +153,8 @@ module Mobile
parents_reply = get_reply_parents(parents_reply, f) parents_reply = get_reply_parents(parents_reply, f)
if parents_reply.count > 2 && !opt[:top] if parents_reply.count > 2 && !opt[:top]
if opt[:type] == 1 if opt[:type] == 1
opt[:top] = true #opt[:top] = true
opt.merge({:top=>true})
tStart = (opt[:page]-1)*5+2 tStart = (opt[:page]-1)*5+2
tEnd = (opt[:page])*5+2 - 1 tEnd = (opt[:page])*5+2 - 1
@ -166,12 +169,14 @@ module Mobile
[] []
end end
else else
opt[:top] = true #opt[:top] = true
opt.merge({:top=>true})
parents_reply = parents_reply.reverse[0..1] parents_reply = parents_reply.reverse[0..1]
parents_reply.reverse parents_reply.reverse
end end
elsif parents_reply.count == 2 && !opt[:top] elsif parents_reply.count == 2 && !opt[:top]
opt[:top] = true #opt[:top] = true
opt.merge({:top=>true})
parents_reply = parents_reply.reverse[0..0] parents_reply = parents_reply.reverse[0..0]
parents_reply.reverse parents_reply.reverse
else else