Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[#19] fix showing discussion in pull requests && small refactoring

This commit is contained in:
Alexander Machehin 2013-03-22 23:17:10 +06:00
parent ce2ca6646e
commit 8f18d0a874
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/pull_request_helper.rb
View File

@ -1,7 +1,7 @@
# -*- encoding : utf-8 -*- # -*- encoding : utf-8 -*-
module PullRequestHelper module PullRequestHelper
def merge_activity comments, commits def merge_activity comments, commits
common_comments, pull_comments = comments.partition {|c| c.data.blank?} common_comments, pull_comments = comments.partition {|c| c.automatic || c.data.blank?}
common_comments = common_comments.map{ |c| [c.created_at, c] } common_comments = common_comments.map{ |c| [c.created_at, c] }
pull_comments = pull_comments.group_by(&:data).map{|data, c| [c.first.created_at, [data || {}, [c].flatten]]} pull_comments = pull_comments.group_by(&:data).map{|data, c| [c.first.created_at, [data || {}, [c].flatten]]}
commits = commits.map{ |c| [(c.committed_date || c.authored_date), c] } commits = commits.map{ |c| [(c.committed_date || c.authored_date), c] }

2
app/models/comment.rb
View File

@ -86,7 +86,7 @@ class Comment < ActiveRecord::Base
end end
def pull_comment? def pull_comment?
return true if commentable.is_a?(Issue) && commentable.pull_request.present? commentable.is_a?(Issue) && commentable.pull_request.present?
end end
def set_additional_data params def set_additional_data params

10
app/views/projects/comments/_list.html.haml
View File

@ -1,12 +1,10 @@
%a{ :name => "comments" } %a{ :name => "comments" }
.hr .hr
%h3#block-list= t("layout.comments.comments_header") %h3#block-list= t("layout.comments.comments_header")
- counter = 1
- list.each do |comment| - list.each do |comment|
-if comment.automatic -unless comment.automatic
- GitPresenters::CommitAsMessagePresenter.present(nil, :comment => comment) do |presenter|
= render 'shared/feed_message', :presenter => presenter, :item_no => counter
- counter += 1
-else
= render 'projects/comments/comment', :comment => comment, :data => {:project => project, :commentable => commentable} = render 'projects/comments/comment', :comment => comment, :data => {:project => project, :commentable => commentable}
-else
- GitPresenters::CommitAsMessagePresenter.present(nil, :comment => comment) do |presenter|
= render 'shared/feed_message', :presenter => presenter, :item_no => "-#{comment.id}"
= render "projects/comments/markdown_help" = render "projects/comments/markdown_help"

7
app/views/projects/pull_requests/_activity.html.haml
View File

@ -4,7 +4,11 @@
-if item.is_a? Comment -if item.is_a? Comment
=render 'projects/git/commits/commits_small', :commits => commits_queue if commits_queue.present? =render 'projects/git/commits/commits_small', :commits => commits_queue if commits_queue.present?
-commits_queue.clear -commits_queue.clear
=render 'projects/comments/comment', :comment => item, :data => {:project => @project, :commentable => @commentable} -unless item.automatic
= render 'projects/comments/comment', :comment => item, :data => {:project => @project, :commentable => @commentable}
-else
- GitPresenters::CommitAsMessagePresenter.present(nil, :comment => item) do |presenter|
= render 'shared/feed_message', :presenter => presenter, :item_no => "-#{item.id}"
-elsif item.is_a? Grit::Commit -elsif item.is_a? Grit::Commit
-commits_queue << item -commits_queue << item
-elsif item.is_a? Array -elsif item.is_a? Array
@ -20,4 +24,3 @@
-else -else
=render 'projects/pull_requests/discussion_comments', :item => item, :add_id => nil =render 'projects/pull_requests/discussion_comments', :item => item, :add_id => nil
=render 'projects/git/commits/commits_small', :commits => commits_queue if commits_queue.present? =render 'projects/git/commits/commits_small', :commits => commits_queue if commits_queue.present?