deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update notes views to support discussions

Browse source
This commit is contained in:
Riyad Preukschas 2012-12-02 20:53:50 +01:00
parent 0b3df2f128
commit 5c2f6d7f05
14 changed files with 270 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/notes_controller.rb
View file

@ -6,13 +6,15 @@ class NotesController < ProjectResourceController
respond_to :js
def index
@target_note = Note.new(noteable_type: params[:target_type].camelize,
noteable_id: params[:target_id])
@target = @target_note.noteable
@notes = Notes::LoadContext.new(project, current_user, params).execute
if params[:target_type] == "merge_request"
@mixed_targets = true
@main_target_type = params[:target_type].camelize
@discussions = discussions_from_notes
@has_diff = true
@has_diff = true
@mixed_targets = true
@discussions = discussions_from_notes
elsif params[:target_type] == "commit"
@has_diff = true
end
@ -72,6 +74,6 @@ class NotesController < ProjectResourceController
# Helps to distinguish e.g. commit notes in mr notes list
def for_main_target?(note)
!@mixed_targets || (@main_target_type == note.noteable_type && !note.for_diff_line?)
!@mixed_targets || (@target.class.name == note.noteable_type && !note.for_diff_line?)
end
end