BigW Consortium Gitlab

Commit 6f5f7e40 by Sean McGivern

Convert ?full_data=1 -> ?view=full_data

parent fecb1a2f
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
endpoint: this.endpoint, endpoint: this.endpoint,
flashContainer: this.$el, flashContainer: this.$el,
data: { data: {
full_data: true, view: 'full_data',
note: { note: {
noteable_type: 'Issue', noteable_type: 'Issue',
noteable_id: this.getIssueData.id, noteable_id: this.getIssueData.id,
......
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
target_type: 'issue', target_type: 'issue',
target_id: this.discussion.noteable_id, target_id: this.discussion.noteable_id,
note: { note: noteText }, note: { note: noteText },
full_data: true, view: 'full_data',
}, },
}; };
......
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
const data = { const data = {
endpoint: this.note.path, endpoint: this.note.path,
note: { note: {
full_data: true, view: 'full_data',
target_type: 'issue', target_type: 'issue',
target_id: this.note.noteable_id, target_id: this.note.noteable_id,
note: { note: noteText }, note: { note: noteText },
......
...@@ -18,7 +18,8 @@ module NotesActions ...@@ -18,7 +18,8 @@ module NotesActions
@notes = prepare_notes_for_rendering(@notes) @notes = prepare_notes_for_rendering(@notes)
notes_json[:notes] = notes_json[:notes] =
if params[:full_data] case params[:view]
when 'full_data'
note_serializer.represent(@notes) note_serializer.represent(@notes)
else else
@notes.map { |note| note_json(note) } @notes.map { |note| note_json(note) }
...@@ -87,7 +88,8 @@ module NotesActions ...@@ -87,7 +88,8 @@ module NotesActions
if note.persisted? if note.persisted?
attrs[:valid] = true attrs[:valid] = true
if params[:full_data] case params[:view]
when 'full_data'
attrs.merge!(note_serializer.represent(note)) attrs.merge!(note_serializer.represent(note))
else else
attrs.merge!( attrs.merge!(
......
...@@ -93,11 +93,13 @@ module NotesHelper ...@@ -93,11 +93,13 @@ module NotesHelper
end end
end end
def notes_url def notes_url(extra_params = {})
if @snippet.is_a?(PersonalSnippet) if @snippet.is_a?(PersonalSnippet)
snippet_notes_path(@snippet) snippet_notes_path(@snippet, extra_params)
else else
project_noteable_notes_path(@project, target_id: @noteable.id, target_type: @noteable.class.name.underscore) params = { target_id: @noteable.id, target_type: @noteable.class.name.underscore }
project_noteable_notes_path(@project, params.merge(extra_params))
end end
end end
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
new_session_path: new_session_path(:user, redirect_to_referer: 'yes'), new_session_path: new_session_path(:user, redirect_to_referer: 'yes'),
markdown_docs: help_page_path('user/markdown'), markdown_docs: help_page_path('user/markdown'),
quick_actions_docs: help_page_path('user/project/quick_actions'), quick_actions_docs: help_page_path('user/project/quick_actions'),
notes_path: "#{notes_url}?full_data=1", notes_path: notes_url(view: 'full_data'),
last_fetched_at: Time.now.to_i, last_fetched_at: Time.now.to_i,
issue_data: serialize_issuable(@issue), issue_data: serialize_issuable(@issue),
current_user_data: UserSerializer.new.represent(current_user).to_json }} current_user_data: UserSerializer.new.represent(current_user).to_json }}
......
...@@ -205,6 +205,14 @@ describe NotesHelper do ...@@ -205,6 +205,14 @@ describe NotesHelper do
expect(helper.notes_url).to eq("/nm/test/noteable/issue/#{@noteable.id}/notes") expect(helper.notes_url).to eq("/nm/test/noteable/issue/#{@noteable.id}/notes")
end end
it 'adds extra params' do
namespace = create(:namespace, path: 'nm')
@project = create(:project, path: 'test', namespace: namespace)
@noteable = create(:issue, project: @project)
expect(helper.notes_url(view: 'full_data')).to eq("/nm/test/noteable/issue/#{@noteable.id}/notes?view=full_data")
end
end end
describe '#note_url' do describe '#note_url' do
......
...@@ -3,7 +3,7 @@ export const notesDataMock = { ...@@ -3,7 +3,7 @@ export const notesDataMock = {
lastFetchedAt: '1501862675', lastFetchedAt: '1501862675',
markdownDocs: '/help/user/markdown', markdownDocs: '/help/user/markdown',
newSessionPath: '/users/sign_in?redirect_to_referer=yes', newSessionPath: '/users/sign_in?redirect_to_referer=yes',
notesPath: '/gitlab-org/gitlab-ce/noteable/issue/98/notes?full_data=1', notesPath: '/gitlab-org/gitlab-ce/noteable/issue/98/notes?view=full_data',
quickActionsDocs: '/help/user/project/quick_actions', quickActionsDocs: '/help/user/project/quick_actions',
registerPath: '/users/sign_in?redirect_to_referer=yes#register-pane', registerPath: '/users/sign_in?redirect_to_referer=yes#register-pane',
}; };
......
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