From 215a01f63ccdc085f75a48f6f7ab6f2b15b5852c Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Date: Fri, 24 Feb 2012 09:16:06 +0200
Subject: move notes login to one controller

---
 app/controllers/notes_controller.rb | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'app/controllers/notes_controller.rb')

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 19c8571705d..327985ef668 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -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
-- 
cgit v1.2.1


From 292a41cbe295f16f7148913b31eb0fb91f3251c3 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 24 Feb 2012 22:36:44 +0200
Subject: Fixed comments for snippets. Tests fixed

---
 app/controllers/notes_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/controllers/notes_controller.rb')

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 327985ef668..9b731a766f0 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -13,6 +13,8 @@ class NotesController < ApplicationController
     @notes = case params[:target_type]
              when "commit" 
                then project.commit_notes(project.commit((params[:target_id]))).fresh.limit(20)
+             when "snippet"
+               then  project.snippets.find(params[:target_id]).notes
              when "wall"
                then project.common_notes.order("created_at DESC").fresh.limit(20)
              when "issue"
-- 
cgit v1.2.1