Fix MR diff comments. Fix wiki comments loading error

randx
1 parent caeb65b1
Showing 5 changed files with 11 additions and 4 deletions Show diff stats
app/assets/stylesheets/sections/notes.scss
app/contexts/notes/load_context.rb
app/models/project.rb
app/models/wiki.rb
app/views/merge_requests/diffs.html.haml
@@ -14,7 +14,7 @@
   border-top:1px solid #aaa;
 }
 #new-notes-list.reversed {
-  border-bottom:1px solid #aaa;
+  border-bottom:1px solid #ccc;
 }
 .issue_notes,
@@ -227,7 +227,7 @@ td .line_note_link {
   }
 }
-.note-text { 
+.note-text {
   border: 1px solid #aaa;
   box-shadow:none;
 }
@@ -20,7 +20,7 @@ module Notes
                  # this is the only case, where the order is DESC
                  project.common_notes.order("created_at DESC, id DESC").limit(50)
                when "wiki"
-                 project.wikis.reverse.map {|w| w.notes.fresh }.flatten[0..20]
+                 project.wiki_notes.limit(20)
                end
       @notes = if after_id
@@ -171,6 +171,10 @@ class Project &lt; ActiveRecord::Base
     end
   end
+  def wiki_notes
+    Note.where(noteable_id: wikis.map(&:id), noteable_type: 'Wiki', project_id: self.id)
+  end
+
   def project_id
     self.id
   end
@@ -28,7 +28,6 @@ class Wiki &lt; ActiveRecord::Base
       end
       new_wiki
     end
-
   end
 end
 # == Schema Information
 = render "show"
+:javascript
+  $(function(){
+    PerLineNotes.init();
+  });
	@@ -14,7 +14,7 @@		@@ -14,7 +14,7 @@
14	border-top:1px solid #aaa;	14	border-top:1px solid #aaa;
15	}	15	}
16	#new-notes-list.reversed {	16	#new-notes-list.reversed {
17	- border-bottom:1px solid #aaa;	17	+ border-bottom:1px solid #ccc;
18	}	18	}
19		19
20	.issue_notes,	20	.issue_notes,
	@@ -227,7 +227,7 @@ td .line_note_link {		@@ -227,7 +227,7 @@ td .line_note_link {
227	}	227	}
228	}	228	}
229		229
230	-.note-text {	230	+.note-text {
231	border: 1px solid #aaa;	231	border: 1px solid #aaa;
232	box-shadow:none;	232	box-shadow:none;
233	}	233	}
	@@ -20,7 +20,7 @@ module Notes		@@ -20,7 +20,7 @@ module Notes
20	# this is the only case, where the order is DESC	20	# this is the only case, where the order is DESC
21	project.common_notes.order("created_at DESC, id DESC").limit(50)	21	project.common_notes.order("created_at DESC, id DESC").limit(50)
22	when "wiki"	22	when "wiki"
23	- project.wikis.reverse.map {\|w\| w.notes.fresh }.flatten[0..20]	23	+ project.wiki_notes.limit(20)
24	end	24	end
25		25
26	@notes = if after_id	26	@notes = if after_id
1	= render "show"	1	= render "show"
2		2
		3	+:javascript
		4	+ $(function(){
		5	+ PerLineNotes.init();
		6	+ });