Fix wall notes

Riyad Preukschas
1 parent 140652e9
Showing 5 changed files with 29 additions and 4 deletions Show diff stats
app/assets/javascripts/notes.js
app/controllers/notes_controller.rb
app/helpers/notes_helper.rb
app/models/note.rb
app/views/notes/_create_common_note.js.haml
@@ -267,6 +267,7 @@ var NoteList = {
     NoteList.bottom_id = newNoteIds.last();
     $("#notes-list").html(html);
+    // for the wall
     if (NoteList.reversed) {
       // init infinite scrolling
       NoteList.initLoadMore();
@@ -352,6 +353,8 @@ var NoteList = {
   /**
    * Initializes getting new notes every n seconds.
+   *
+   * Note: only used on wall.
    */
   initRefreshNew: function() {
     setInterval("NoteList.getNew()", 10000);
@@ -359,6 +362,8 @@ var NoteList = {
   /**
    * Gets the new set of notes.
+   *
+   * Note: only used on wall.
    */
   getNew: function() {
     $.ajax({
@@ -371,6 +376,8 @@ var NoteList = {
   /**
    * Called in response to getNew().
    * Replaces the content of #new-notes-list with the given html.
+   *
+   * Note: only used on wall.
    */
   replaceNewNotes: function(newNoteIds, html) {
     $("#new-notes-list").html(html);
@@ -378,7 +385,7 @@ var NoteList = {
   },
   /**
-   * Adds a single common note to #(new-)notes-list.
+   * Adds a single common note to #notes-list.
    */
   appendNewNote: function(id, html) {
     $("#notes-list").append(html);
@@ -386,7 +393,7 @@ var NoteList = {
   },
   /**
-   * Adds a single discussion note to #(new-)notes-list.
+   * Adds a single discussion note to #notes-list.
    */
   appendNewDiscussionNote: function(discussionId, diffRowHtml, noteHtml) {
     // is this the first note of discussion?
@@ -403,6 +410,15 @@ var NoteList = {
   },
   /**
+   * Adds a single wall note to #new-notes-list.
+   *
+   * Note: only used on wall.
+   */
+  appendNewWallNote: function(id, html) {
+    $("#new-notes-list").prepend(html);
+  },
+
+  /**
    * Recalculates the votes and updates them (if they are displayed at all).
    *
    * Assumes all relevant notes are displayed (i.e. there are no more notes to
@@ -71,6 +71,7 @@ class NotesController &lt; ProjectResourceController
   # Helps to distinguish e.g. commit notes in mr notes list
   def note_for_main_target?(note)
-    @target_type.camelize == note.noteable_type && !note.for_diff_line?
+    note.for_wall? ||
+      (@target_type.camelize == note.noteable_type && !note.for_diff_line?)
   end
 end
 module NotesHelper
    # Helps to distinguish e.g. commit notes in mr notes list
   def note_for_main_target?(note)
-    @target_type.camelize == note.noteable_type && !note.for_diff_line?
+    note.for_wall? ||
+      (@target_type.camelize == note.noteable_type && !note.for_diff_line?)
   end
   def note_target_fields
@@ -115,6 +115,10 @@ class Note &lt; ActiveRecord::Base
     for_merge_request? && for_diff_line?
   end
+  def for_wall?
+    noteable_type.blank?
+  end
+
   # override to return commits, which are not active record
   def noteable
     if for_commit?
 - if note.valid?
+  - if note.for_wall?
+    NoteList.appendNewWallNote(#{note.id}, "#{escape_javascript(render "notes/note", note: note)}");
+  - else
     NoteList.appendNewNote(#{note.id}, "#{escape_javascript(render "notes/note", note: note)}");
 - else
	@@ -71,6 +71,7 @@ class NotesController < ProjectResourceController		@@ -71,6 +71,7 @@ class NotesController < ProjectResourceController
71		71
72	# Helps to distinguish e.g. commit notes in mr notes list	72	# Helps to distinguish e.g. commit notes in mr notes list
73	def note_for_main_target?(note)	73	def note_for_main_target?(note)
74	- @target_type.camelize == note.noteable_type && !note.for_diff_line?	74	+ note.for_wall? \|\|
		75	+ (@target_type.camelize == note.noteable_type && !note.for_diff_line?)
75	end	76	end
76	end	77	end
1	module NotesHelper	1	module NotesHelper
2	# Helps to distinguish e.g. commit notes in mr notes list	2	# Helps to distinguish e.g. commit notes in mr notes list
3	def note_for_main_target?(note)	3	def note_for_main_target?(note)
4	- @target_type.camelize == note.noteable_type && !note.for_diff_line?	4	+ note.for_wall? \|\|
		5	+ (@target_type.camelize == note.noteable_type && !note.for_diff_line?)
5	end	6	end
6		7
7	def note_target_fields	8	def note_target_fields
1	- if note.valid?	1	- if note.valid?
		2	+ - if note.for_wall?
		3	+ NoteList.appendNewWallNote(#{note.id}, "#{escape_javascript(render "notes/note", note: note)}");
		4	+ - else
2	NoteList.appendNewNote(#{note.id}, "#{escape_javascript(render "notes/note", note: note)}");	5	NoteList.appendNewNote(#{note.id}, "#{escape_javascript(render "notes/note", note: note)}");
3		6
4	- else	7	- else