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

move notes login to one controller

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-02-24 09:16:06 +02:00
parent 81092c0198
commit 215a01f63c
15 changed files with 55 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

30
app/controllers/notes_controller.rb
View file

@ -9,6 +9,23 @@ class NotesController < ApplicationController
respond_to :js
def index
@notes = case params[:target_type]
when "commit"
then project.commit_notes(project.commit((params[:target_id]))).fresh.limit(20)
when "wall"
then project.common_notes.order("created_at DESC").fresh.limit(20)
when "issue"
then project.issues.find(params[:target_id]).notes.inc_author.order("created_at DESC").limit(20)
when "merge_request"
then project.merge_requests.find(params[:target_id]).notes.inc_author.order("created_at DESC").limit(20)
end
respond_to do |format|
format.js { respond_with_notes }
end
end
def create
@note = @project.notes.new(params[:note])
@note.author = current_user
@ -34,4 +51,17 @@ class NotesController < ApplicationController
end
end
protected
def respond_with_notes
if params[:last_id] && params[:first_id]
@notes = @notes.where("id >= ?", params[:first_id])
elsif params[:last_id]
@notes = @notes.where("id > ?", params[:last_id])
elsif params[:first_id]
@notes = @notes.where("id < ?", params[:first_id])
else
nil
end
end
end