Commit 215a01f6 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

move notes login to one controller

parent 81092c01
var NoteList = { var NoteList = {
notes_path: null,
target_params: null,
target_id: 0,
target_type: null,
first_id: 0, first_id: 0,
last_id: 0, last_id: 0,
resource_name: null,
disable:false, disable:false,
init: init:
function(resource_name, first_id, last_id) { function(tid, tt, path) {
this.resource_name = resource_name; this.notes_path = path + ".js";
this.first_id = first_id; this.target_id = tid;
this.last_id = last_id; this.target_type = tt;
this.target_params = "&target_type=" + this.target_type + "&target_id=" + this.target_id
this.refresh();
this.initRefresh(); this.initRefresh();
this.initLoadMore(); this.initLoadMore();
}, },
...@@ -19,8 +24,8 @@ getOld: ...@@ -19,8 +24,8 @@ getOld:
$('.loading').show(); $('.loading').show();
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: location.href, url: this.notes_path,
data: "first_id=" + this.first_id, data: "first_id=" + this.first_id + this.target_params,
complete: function(){ $('.loading').hide()}, complete: function(){ $('.loading').hide()},
dataType: "script"}); dataType: "script"});
}, },
...@@ -56,8 +61,8 @@ getNew: ...@@ -56,8 +61,8 @@ getNew:
// refersh notes list // refersh notes list
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: location.href, url: this.notes_path,
data: "last_id=" + this.last_id, data: "last_id=" + this.last_id + this.target_params,
dataType: "script"}); dataType: "script"});
}, },
...@@ -66,8 +71,8 @@ refresh: ...@@ -66,8 +71,8 @@ refresh:
// refersh notes list // refersh notes list
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: location.href, url: this.notes_path,
data: "first_id=" + this.first_id + "&last_id=" + this.last_id, data: "first_id=" + this.first_id + "&last_id=" + this.last_id + this.target_params,
dataType: "script"}); dataType: "script"});
}, },
......
...@@ -95,18 +95,6 @@ class ApplicationController < ActionController::Base ...@@ -95,18 +95,6 @@ class ApplicationController < ActionController::Base
redirect_to @project unless @project.repo_exists? && @project.has_commits? redirect_to @project unless @project.repo_exists? && @project.has_commits?
end end
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
def no_cache_headers def no_cache_headers
response.headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate" response.headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate"
response.headers["Pragma"] = "no-cache" response.headers["Pragma"] = "no-cache"
......
...@@ -29,16 +29,9 @@ class CommitsController < ApplicationController ...@@ -29,16 +29,9 @@ class CommitsController < ApplicationController
git_not_found! and return unless @commit git_not_found! and return unless @commit
@notes = project.commit_notes(@commit).fresh.limit(20)
@note = @project.build_commit_note(@commit) @note = @project.build_commit_note(@commit)
@comments_allowed = true @comments_allowed = true
@line_notes = project.commit_line_notes(@commit) @line_notes = project.commit_line_notes(@commit)
respond_to do |format|
format.html
format.js { respond_with_notes }
end
end end
def compare def compare
......
...@@ -49,7 +49,6 @@ class IssuesController < ApplicationController ...@@ -49,7 +49,6 @@ class IssuesController < ApplicationController
end end
def show def show
@notes = @issue.notes.inc_author.order("created_at DESC").limit(20)
@note = @project.notes.new(:noteable => @issue) @note = @project.notes.new(:noteable => @issue)
@commits = if @issue.branch_name && @project.repo.heads.map(&:name).include?(@issue.branch_name) @commits = if @issue.branch_name && @project.repo.heads.map(&:name).include?(@issue.branch_name)
...@@ -61,7 +60,7 @@ class IssuesController < ApplicationController ...@@ -61,7 +60,7 @@ class IssuesController < ApplicationController
respond_to do |format| respond_to do |format|
format.html format.html
format.js { respond_with_notes } format.js
end end
end end
......
...@@ -39,7 +39,6 @@ class MergeRequestsController < ApplicationController ...@@ -39,7 +39,6 @@ class MergeRequestsController < ApplicationController
git_not_found! and return git_not_found! and return
end end
@notes = @merge_request.notes.inc_author.order("created_at DESC").limit(20)
@note = @project.notes.new(:noteable => @merge_request) @note = @project.notes.new(:noteable => @merge_request)
@commits = @project.repo. @commits = @project.repo.
...@@ -52,7 +51,7 @@ class MergeRequestsController < ApplicationController ...@@ -52,7 +51,7 @@ class MergeRequestsController < ApplicationController
respond_to do |format| respond_to do |format|
format.html format.html
format.js { respond_with_notes } format.js
end end
end end
......
...@@ -9,6 +9,23 @@ class NotesController < ApplicationController ...@@ -9,6 +9,23 @@ class NotesController < ApplicationController
respond_to :js 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 def create
@note = @project.notes.new(params[:note]) @note = @project.notes.new(params[:note])
@note.author = current_user @note.author = current_user
...@@ -34,4 +51,17 @@ class NotesController < ApplicationController ...@@ -34,4 +51,17 @@ class NotesController < ApplicationController
end end
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 end
...@@ -82,14 +82,10 @@ class ProjectsController < ApplicationController ...@@ -82,14 +82,10 @@ class ProjectsController < ApplicationController
def wall def wall
return render_404 unless @project.wall_enabled return render_404 unless @project.wall_enabled
@note = Note.new @note = Note.new
@notes = @project.common_notes.order("created_at DESC")
@notes = @notes.fresh.limit(20)
respond_to do |format| respond_to do |format|
format.html format.html
format.js { respond_with_notes }
end end
end end
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
%p.cgray %p.cgray
Showing #{pluralize(@commit.diffs.count, "changed file")} Showing #{pluralize(@commit.diffs.count, "changed file")}
= render "commits/diffs", :diffs => @commit.diffs = render "commits/diffs", :diffs => @commit.diffs
= render "notes/notes" = render "notes/notes", :tid => @commit.id, :tt => "commit"
= render "notes/per_line_form" = render "notes/per_line_form"
......
...@@ -41,5 +41,5 @@ ...@@ -41,5 +41,5 @@
%div= simple_format @issue.title %div= simple_format @issue.title
.issue_notes= render "notes/notes" .issue_notes= render "notes/notes", :tid => @issue.id, :tt => "issue"
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
%img{:src => "/assets/ajax-loader-facebook.gif", :class => "dashboard-loader"} %img{:src => "/assets/ajax-loader-facebook.gif", :class => "dashboard-loader"}
.merge-request-notes .merge-request-notes
.merge_request_notes= render "notes/notes" .merge_request_notes= render "notes/notes", :tid => @merge_request.id, :tt => "merge_request"
.loading{ :style => "display:none;"} .loading{ :style => "display:none;"}
%center= image_tag "ajax-loader.gif" %center= image_tag "ajax-loader.gif"
.clear .clear
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
= render "notes/form" = render "notes/form"
.clear .clear
%hr %hr
%ul#notes-list= render "notes/notes_list" %ul#notes-list
:javascript :javascript
$('.delete-note').live('ajax:success', function() { $('.delete-note').live('ajax:success', function() {
...@@ -22,5 +22,5 @@ ...@@ -22,5 +22,5 @@
$('.attach_holder').show(); $('.attach_holder').show();
}); });
NoteList.init("wall", #{@notes.last.try(:id) || 0}, #{@notes.first.try(:id) || 0}); NoteList.init("#{tid}", "#{tt}", "#{project_notes_path(@project)}");
}); });
%div.wall_page %div.wall_page
= render "notes/notes" = render "notes/notes", :tid => nil, :tt => "wall"
.loading{ :style => "display:none;"} .loading{ :style => "display:none;"}
%center= image_tag "ajax-loader.gif" %center= image_tag "ajax-loader.gif"
......
...@@ -121,7 +121,7 @@ Gitlab::Application.routes.draw do ...@@ -121,7 +121,7 @@ Gitlab::Application.routes.draw do
get :search get :search
end end
end end
resources :notes, :only => [:create, :destroy] resources :notes, :only => [:index, :create, :destroy]
end end
root :to => "projects#index" root :to => "projects#index"
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