Download as
Browse Code »

Commit 215a01f63ccdc085f75a48f6f7ab6f2b15b5852c

Authored by Dmitriy Zaporozhets
1 parent 81092c01
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

move notes login to one controller

Showing 16 changed files with 56 additions and 47 deletions   Show diff stats
app/assets/javascripts/note.js
  Diff comments   View file @215a01f
1 1 var NoteList = {
2 2  
  3 +notes_path: null,
  4 +target_params: null,
  5 +target_id: 0,
  6 +target_type: null,
3 7 first_id: 0,
4 8 last_id: 0,
5   -resource_name: null,
6 9 disable:false,
7 10  
8 11 init:
9   - function(resource_name, first_id, last_id) {
10   - this.resource_name = resource_name;
11   - this.first_id = first_id;
12   - this.last_id = last_id;
  12 + function(tid, tt, path) {
  13 + this.notes_path = path + ".js";
  14 + this.target_id = tid;
  15 + this.target_type = tt;
  16 + this.target_params = "&target_type=" + this.target_type + "&target_id=" + this.target_id
  17 + this.refresh();
13 18 this.initRefresh();
14 19 this.initLoadMore();
15 20 },
... ... @@ -19,8 +24,8 @@ getOld:
19 24 $('.loading').show();
20 25 $.ajax({
21 26 type: "GET",
22   - url: location.href,
23   - data: "first_id=" + this.first_id,
  27 + url: this.notes_path,
  28 + data: "first_id=" + this.first_id + this.target_params,
24 29 complete: function(){ $('.loading').hide()},
25 30 dataType: "script"});
26 31 },
... ... @@ -56,8 +61,8 @@ getNew:
56 61 // refersh notes list
57 62 $.ajax({
58 63 type: "GET",
59   - url: location.href,
60   - data: "last_id=" + this.last_id,
  64 + url: this.notes_path,
  65 + data: "last_id=" + this.last_id + this.target_params,
61 66 dataType: "script"});
62 67 },
63 68  
... ... @@ -66,8 +71,8 @@ refresh:
66 71 // refersh notes list
67 72 $.ajax({
68 73 type: "GET",
69   - url: location.href,
70   - data: "first_id=" + this.first_id + "&last_id=" + this.last_id,
  74 + url: this.notes_path,
  75 + data: "first_id=" + this.first_id + "&last_id=" + this.last_id + this.target_params,
71 76 dataType: "script"});
72 77 },
73 78  
... ...
app/controllers/application_controller.rb
  Diff comments   View file @215a01f
... ... @@ -95,18 +95,6 @@ class ApplicationController < ActionController::Base
95 95 redirect_to @project unless @project.repo_exists? && @project.has_commits?
96 96 end
97 97  
98   - def respond_with_notes
99   - if params[:last_id] && params[:first_id]
100   - @notes = @notes.where("id >= ?", params[:first_id])
101   - elsif params[:last_id]
102   - @notes = @notes.where("id > ?", params[:last_id])
103   - elsif params[:first_id]
104   - @notes = @notes.where("id < ?", params[:first_id])
105   - else
106   - nil
107   - end
108   - end
109   -
110 98 def no_cache_headers
111 99 response.headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate"
112 100 response.headers["Pragma"] = "no-cache"
... ...
app/controllers/commits_controller.rb
  Diff comments   View file @215a01f
... ... @@ -29,16 +29,9 @@ class CommitsController &lt; ApplicationController
29 29  
30 30 git_not_found! and return unless @commit
31 31  
32   - @notes = project.commit_notes(@commit).fresh.limit(20)
33 32 @note = @project.build_commit_note(@commit)
34   -
35 33 @comments_allowed = true
36 34 @line_notes = project.commit_line_notes(@commit)
37   -
38   - respond_to do |format|
39   - format.html
40   - format.js { respond_with_notes }
41   - end
42 35 end
43 36  
44 37 def compare
... ...
app/controllers/issues_controller.rb
  Diff comments   View file @215a01f
... ... @@ -49,7 +49,6 @@ class IssuesController &lt; ApplicationController
49 49 end
50 50  
51 51 def show
52   - @notes = @issue.notes.inc_author.order("created_at DESC").limit(20)
53 52 @note = @project.notes.new(:noteable => @issue)
54 53  
55 54 @commits = if @issue.branch_name && @project.repo.heads.map(&:name).include?(@issue.branch_name)
... ... @@ -61,7 +60,7 @@ class IssuesController &lt; ApplicationController
61 60  
62 61 respond_to do |format|
63 62 format.html
64   - format.js { respond_with_notes }
  63 + format.js
65 64 end
66 65 end
67 66  
... ...
app/controllers/merge_requests_controller.rb
  Diff comments   View file @215a01f
... ... @@ -39,7 +39,6 @@ class MergeRequestsController &lt; ApplicationController
39 39 git_not_found! and return
40 40 end
41 41  
42   - @notes = @merge_request.notes.inc_author.order("created_at DESC").limit(20)
43 42 @note = @project.notes.new(:noteable => @merge_request)
44 43  
45 44 @commits = @project.repo.
... ... @@ -52,7 +51,7 @@ class MergeRequestsController &lt; ApplicationController
52 51  
53 52 respond_to do |format|
54 53 format.html
55   - format.js { respond_with_notes }
  54 + format.js
56 55 end
57 56 end
58 57  
... ...
app/controllers/notes_controller.rb
  Diff comments   View file @215a01f
... ... @@ -9,6 +9,23 @@ class NotesController &lt; ApplicationController
9 9  
10 10 respond_to :js
11 11  
  12 + def index
  13 + @notes = case params[:target_type]
  14 + when "commit"
  15 + then project.commit_notes(project.commit((params[:target_id]))).fresh.limit(20)
  16 + when "wall"
  17 + then project.common_notes.order("created_at DESC").fresh.limit(20)
  18 + when "issue"
  19 + then project.issues.find(params[:target_id]).notes.inc_author.order("created_at DESC").limit(20)
  20 + when "merge_request"
  21 + then project.merge_requests.find(params[:target_id]).notes.inc_author.order("created_at DESC").limit(20)
  22 + end
  23 +
  24 + respond_to do |format|
  25 + format.js { respond_with_notes }
  26 + end
  27 + end
  28 +
12 29 def create
13 30 @note = @project.notes.new(params[:note])
14 31 @note.author = current_user
... ... @@ -34,4 +51,17 @@ class NotesController &lt; ApplicationController
34 51 end
35 52 end
36 53  
  54 + protected
  55 +
  56 + def respond_with_notes
  57 + if params[:last_id] && params[:first_id]
  58 + @notes = @notes.where("id >= ?", params[:first_id])
  59 + elsif params[:last_id]
  60 + @notes = @notes.where("id > ?", params[:last_id])
  61 + elsif params[:first_id]
  62 + @notes = @notes.where("id < ?", params[:first_id])
  63 + else
  64 + nil
  65 + end
  66 + end
37 67 end
... ...
app/controllers/projects_controller.rb
  Diff comments   View file @215a01f
... ... @@ -82,14 +82,10 @@ class ProjectsController &lt; ApplicationController
82 82  
83 83 def wall
84 84 return render_404 unless @project.wall_enabled
85   -
86 85 @note = Note.new
87   - @notes = @project.common_notes.order("created_at DESC")
88   - @notes = @notes.fresh.limit(20)
89 86  
90 87 respond_to do |format|
91 88 format.html
92   - format.js { respond_with_notes }
93 89 end
94 90 end
95 91  
... ...
app/views/commits/show.html.haml
  Diff comments   View file @215a01f
... ... @@ -21,7 +21,7 @@
21 21 %p.cgray
22 22 Showing #{pluralize(@commit.diffs.count, "changed file")}
23 23 = render "commits/diffs", :diffs => @commit.diffs
24   -= render "notes/notes"
  24 += render "notes/notes", :tid => @commit.id, :tt => "commit"
25 25 = render "notes/per_line_form"
26 26  
27 27  
... ...
app/views/issues/show.html.haml
  Diff comments   View file @215a01f
... ... @@ -41,5 +41,5 @@
41 41 %div= simple_format @issue.title
42 42  
43 43  
44   -.issue_notes= render "notes/notes"
  44 +.issue_notes= render "notes/notes", :tid => @issue.id, :tt => "issue"
45 45  
... ...
app/views/issues/show.js.haml
View file @81092c0
... ... @@ -1 +0,0 @@
1   -= render "notes/load"
app/views/merge_requests/show.html.haml
  Diff comments   View file @215a01f
... ... @@ -63,7 +63,7 @@
63 63 %img{:src => "/assets/ajax-loader-facebook.gif", :class => "dashboard-loader"}
64 64  
65 65 .merge-request-notes
66   - .merge_request_notes= render "notes/notes"
  66 + .merge_request_notes= render "notes/notes", :tid => @merge_request.id, :tt => "merge_request"
67 67 .loading{ :style => "display:none;"}
68 68 %center= image_tag "ajax-loader.gif"
69 69 .clear
... ...
app/views/notes/_notes.html.haml
  Diff comments   View file @215a01f
... ... @@ -2,7 +2,7 @@
2 2 = render "notes/form"
3 3 .clear
4 4 %hr
5   -%ul#notes-list= render "notes/notes_list"
  5 +%ul#notes-list
6 6  
7 7 :javascript
8 8 $('.delete-note').live('ajax:success', function() {
... ... @@ -22,5 +22,5 @@
22 22 $('.attach_holder').show();
23 23 });
24 24  
25   - NoteList.init("wall", #{@notes.last.try(:id) || 0}, #{@notes.first.try(:id) || 0});
  25 + NoteList.init("#{tid}", "#{tt}", "#{project_notes_path(@project)}");
26 26 });
... ...
app/views/notes/index.js.haml 0 → 100644
  Diff comments   View file @215a01f
... ... @@ -0,0 +1 @@
  1 += render "notes/load"
... ...
app/views/projects/wall.html.haml
  Diff comments   View file @215a01f
1 1 %div.wall_page
2   - = render "notes/notes"
  2 + = render "notes/notes", :tid => nil, :tt => "wall"
3 3  
4 4 .loading{ :style => "display:none;"}
5 5 %center= image_tag "ajax-loader.gif"
... ...
app/views/projects/wall.js.haml
View file @81092c0
... ... @@ -1 +0,0 @@
1   -= render "notes/load"
config/routes.rb
  Diff comments   View file @215a01f
... ... @@ -121,7 +121,7 @@ Gitlab::Application.routes.draw do
121 121 get :search
122 122 end
123 123 end
124   - resources :notes, :only => [:create, :destroy]
  124 + resources :notes, :only => [:index, :create, :destroy]
125 125 end
126 126 root :to => "projects#index"
127 127 end
... ...