add attachemnts support for wall

Dmitriy Zaporozhets
1 parent 4d378f3c
Showing 6 changed files with 56 additions and 6 deletions Show diff stats
app/assets/javascripts/notes.js
app/assets/javascripts/wall.js.coffee
app/assets/stylesheets/sections/wall.scss
app/views/layouts/project_resource.html.haml
app/views/walls/show.html.haml
lib/api/entities.rb
@@ -4,7 +4,6 @@ var NoteList = {
   target_params: null,
   target_id: 0,
   target_type: null,
-  loading_more_disabled: false,
  
   init: function(tid, tt, path) {
     NoteList.notes_path = path + ".js";
@@ -9,6 +9,7 @@
     Wall.notes_path = "/api/" + gon.api_version + "/projects/" + project_id + "/notes.json"
     Wall.getContent()
     Wall.initRefresh()
+    Wall.initForm()
  
   # 
   # Gets an initial set of notes.
@@ -28,6 +29,7 @@
           if $.inArray(note.id, Wall.note_ids) == -1
             Wall.note_ids.push(note.id)
             Wall.renderNote(note)
+            Wall.scrollDown()
  
       complete: ->
         $('.js-notes-busy').removeClass("loading")
@@ -35,8 +37,15 @@
         $('.js-notes-busy').addClass("loading")
  
   renderNote: (note) ->
-    author = '<strong>' + note.author.name + ': &nbsp;</strong>'
-    html = '<li>' + author + note.body + '</li>'
+    author = '<strong class="wall-author">' + note.author.name + '</strong>'
+    body = '<span class="wall-text">' + note.body + '</span>'
+    file = ''
+
+    if note.attachment
+      file = '<span class="wall-file"><a href="/files/note/' + note.id + '/' + note.attachment + '">' + note.attachment + '</a></span>'
+    
+    html = '<li>' + author + body + file + '</li>'
+
     $('ul.notes').append(html)
  
   initRefresh: ->
@@ -44,3 +53,33 @@
  
   refresh: ->
     Wall.getContent()
+
+  scrollDown: ->
+    notes = $('ul.notes')
+    $('body').scrollTop(notes.height())
+
+  initForm: ->
+    form = $('.new_note')
+    form.find("#target_type").val('wall')
+
+    # remove unnecessary fields and buttons
+    form.find("#note_line_code").remove()
+    form.find(".js-close-discussion-note-form").remove()
+    form.find('.js-notify-commit-author').remove()
+
+    form.on 'ajax:success', ->
+      Wall.refresh()
+      form.find(".js-note-text").val("").trigger("input")
+    
+    form.on 'ajax:complete', ->
+      form.find(".js-comment-button").removeAttr('disabled')
+      form.find(".js-comment-button").removeClass('disabled')
+
+    form.on "click", ".js-choose-note-attachment-button", ->
+      form.find(".js-note-attachment-input").click()
+
+    form.on "change", ".js-note-attachment-input", ->
+      filename = $(this).val().replace(/^.*[\\\/]/, '')
+      form.find(".js-attachment-filename").text(filename)
+    
+    form.show()
@@ -10,10 +10,20 @@
     padding: 3px;
     padding-bottom: 25px;
     border: 1px solid #DDD;
-    display: block;
   }
  
   .notes {
     margin-bottom: 160px;
+
+    .wall-author {
+      color: #666;
+      margin-right: 10px;
+      border-right: 1px solid #CCC;
+      padding-right: 5px
+    }
+
+    .wall-file {
+      float: right;
+    }
   }
 }
@@ -40,7 +40,7 @@
             = link_to 'Wiki', project_wiki_path(@project, :home)
  
         - if @project.wall_enabled
-          = nav_link(path: 'projects#wall') do
+          = nav_link(controller: :walls) do
             = link_to 'Wall', project_wall_path(@project)
  
         - if @project.snippets_enabled
@@ -3,7 +3,8 @@
   .notes-busy.js-notes-busy
  
   .js-main-target-form
-  = render "notes/form"
+  - if can? current_user, :write_note, @project
+    = render "notes/form"
  
 :javascript
   $(function(){
@@ -95,6 +95,7 @@ module Gitlab
     class Note < Grape::Entity
       expose :id
       expose :note, as: :body
+      expose :attachment_identifier, as: :attachment
       expose :author, using: Entities::UserBasic
       expose :created_at
     end
...	...	@@ -4,7 +4,6 @@ var NoteList = {
4	4	target_params: null,
5	5	target_id: 0,
6	6	target_type: null,
7		- loading_more_disabled: false,
8	7
9	8	init: function(tid, tt, path) {
10	9	NoteList.notes_path = path + ".js";
...	...
...	...	@@ -9,6 +9,7 @@
9	9	Wall.notes_path = "/api/" + gon.api_version + "/projects/" + project_id + "/notes.json"
10	10	Wall.getContent()
11	11	Wall.initRefresh()
	12	+ Wall.initForm()
12	13
13	14	#
14	15	# Gets an initial set of notes.
...	...	@@ -28,6 +29,7 @@
28	29	if $.inArray(note.id, Wall.note_ids) == -1
29	30	Wall.note_ids.push(note.id)
30	31	Wall.renderNote(note)
	32	+ Wall.scrollDown()
31	33
32	34	complete: ->
33	35	$('.js-notes-busy').removeClass("loading")
...	...	@@ -35,8 +37,15 @@
35	37	$('.js-notes-busy').addClass("loading")
36	38
37	39	renderNote: (note) ->
38		- author = '<strong>' + note.author.name + ':  </strong>'
39		- html = '<li>' + author + note.body + '</li>'
	40	+ author = '<strong class="wall-author">' + note.author.name + '</strong>'
	41	+ body = '<span class="wall-text">' + note.body + '</span>'
	42	+ file = ''
	43	+
	44	+ if note.attachment
	45	+ file = '<span class="wall-file"><a href="/files/note/' + note.id + '/' + note.attachment + '">' + note.attachment + '</a></span>'
	46	+
	47	+ html = '<li>' + author + body + file + '</li>'
	48	+
40	49	$('ul.notes').append(html)
41	50
42	51	initRefresh: ->
...	...	@@ -44,3 +53,33 @@
44	53
45	54	refresh: ->
46	55	Wall.getContent()
	56	+
	57	+ scrollDown: ->
	58	+ notes = $('ul.notes')
	59	+ $('body').scrollTop(notes.height())
	60	+
	61	+ initForm: ->
	62	+ form = $('.new_note')
	63	+ form.find("#target_type").val('wall')
	64	+
	65	+ # remove unnecessary fields and buttons
	66	+ form.find("#note_line_code").remove()
	67	+ form.find(".js-close-discussion-note-form").remove()
	68	+ form.find('.js-notify-commit-author').remove()
	69	+
	70	+ form.on 'ajax:success', ->
	71	+ Wall.refresh()
	72	+ form.find(".js-note-text").val("").trigger("input")
	73	+
	74	+ form.on 'ajax:complete', ->
	75	+ form.find(".js-comment-button").removeAttr('disabled')
	76	+ form.find(".js-comment-button").removeClass('disabled')
	77	+
	78	+ form.on "click", ".js-choose-note-attachment-button", ->
	79	+ form.find(".js-note-attachment-input").click()
	80	+
	81	+ form.on "change", ".js-note-attachment-input", ->
	82	+ filename = $(this).val().replace(/^.*[\\\/]/, '')
	83	+ form.find(".js-attachment-filename").text(filename)
	84	+
	85	+ form.show()
...	...
...	...	@@ -10,10 +10,20 @@
10	10	padding: 3px;
11	11	padding-bottom: 25px;
12	12	border: 1px solid #DDD;
13		- display: block;
14	13	}
15	14
16	15	.notes {
17	16	margin-bottom: 160px;
	17	+
	18	+ .wall-author {
	19	+ color: #666;
	20	+ margin-right: 10px;
	21	+ border-right: 1px solid #CCC;
	22	+ padding-right: 5px
	23	+ }
	24	+
	25	+ .wall-file {
	26	+ float: right;
	27	+ }
18	28	}
19	29	}
...	...
...	...	@@ -40,7 +40,7 @@
40	40	= link_to 'Wiki', project_wiki_path(@project, :home)
41	41
42	42	- if @project.wall_enabled
43		- = nav_link(path: 'projects#wall') do
	43	+ = nav_link(controller: :walls) do
44	44	= link_to 'Wall', project_wall_path(@project)
45	45
46	46	- if @project.snippets_enabled
...	...
...	...	@@ -3,7 +3,8 @@
3	3	.notes-busy.js-notes-busy
4	4
5	5	.js-main-target-form
6		- = render "notes/form"
	6	+ - if can? current_user, :write_note, @project
	7	+ = render "notes/form"
7	8
8	9	:javascript
9	10	$(function(){
...	...
...	...	@@ -95,6 +95,7 @@ module Gitlab
95	95	class Note < Grape::Entity
96	96	expose :id
97	97	expose :note, as: :body
	98	+ expose :attachment_identifier, as: :attachment
98	99	expose :author, using: Entities::UserBasic
99	100	expose :created_at
100	101	end
...	...