Commit dda852a0 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #1629 from riyad/show-notes-indicator-for-commits-and-merge-requests

Show numer of notes for commits and merge requests
parents 60b4c88e 6dc8c0ea
......@@ -203,6 +203,11 @@
@extend .cgray;
}
.notes_count {
float:right;
margin: -6px 8px 6px;
}
code {
background:#FCEEC1;
color:$style_color;
......
......@@ -186,6 +186,11 @@ class MergeRequest < ActiveRecord::Base
patch_path
end
def mr_and_commit_notes
commit_ids = commits.map(&:id)
Note.where("(noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR (noteable_type = 'Commit' AND noteable_id IN (:commit_ids))", mr_id: id, commit_ids: commit_ids)
end
end
# == Schema Information
......
......@@ -13,3 +13,10 @@
= time_ago_in_words(commit.committed_date)
ago
&nbsp;
%span.notes_count
- notes = @project.commit_notes(commit) + @project.commit_line_notes(commit)
- if notes.any?
%span.btn.small.disabled.grouped
%i.icon-comment
= notes.count
......@@ -9,7 +9,7 @@
- if merge_request.notes.any?
%span.btn.small.disabled.grouped
%i.icon-comment
= merge_request.notes.count
= merge_request.mr_and_commit_notes.count
%span.btn.small.disabled.grouped
= merge_request.source_branch
&rarr;
......
......@@ -35,4 +35,19 @@ describe MergeRequest do
it { should include_module(IssueCommonality) }
it { should include_module(Votes) }
end
describe "#mr_and_commit_notes" do
let!(:merge_request) { Factory.create(:merge_request) }
before do
merge_request.stub(:commits) { [merge_request.project.commit] }
Factory.create(:note, noteable: merge_request.commits.first)
Factory.create(:note, noteable: merge_request)
end
it "should include notes for commits" do
merge_request.commits.should_not be_empty
merge_request.mr_and_commit_notes.count.should == 2
end
end
end
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