diff options
author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-14 22:54:44 +0300 |
---|---|---|
committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-14 22:54:44 +0300 |
commit | eea76aef333d4f5a0721f278efe9828a13f0f05f (patch) | |
tree | 482bec7653f8bb822085148dc8245d6b40b8557a | |
parent | 427dc98d980fa9b16a565bf23514ed392ece1be2 (diff) |
moving ajax json methodsmr-ajax
-rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 17 | ||||
-rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 10 | ||||
-rw-r--r-- | app/views/projects/merge_requests/show/_mr_title.html.haml | 17 |
3 files changed, 26 insertions, 18 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index b1ea454dcbc..7e94fb60548 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -50,7 +50,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController respond_to do |format| format.html - format.json { render json: @merge_request } format.diff { render text: @merge_request.to_diff(current_user) } format.patch { render text: @merge_request.to_patch(current_user) } end @@ -137,8 +136,9 @@ class Projects::MergeRequestsController < Projects::ApplicationController author = nil avatar = nil if @merge_request.closed? && @merge_request.closed_event - author = @merge_request.closed_event.author - # avatar = avatar_icon(author,16) + closing_author = @merge_request.closed_event.author + else + original_author = @merge_request.author end respond_to do |format| format.js @@ -153,8 +153,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController closed: @merge_request.closed?, locked: @merge_request.locked?, merged: @merge_request.merged?, - author: author, - avatar: avatar + original_author: original_author, + closing_author: closing_author } end end @@ -169,12 +169,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController avatar = nil if @merge_request.closed? && @merge_request.closed_event author = @merge_request.closed_event.author - # avatar = avatar_icon(author,16) end respond_to do |format| format.js format.html do - render partial: "projects/merge_requests/widget/show.html.haml", layout: false + render partial: "projects/merge_requests/widget/_show.html.haml", layout: false end format.json do render json: { @@ -183,8 +182,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController closed: @merge_request.closed?, locked: @merge_request.locked?, merged: @merge_request.merged?, - author: author, - avatar: avatar + author: @merge_request.author, + avatar: @merge_request.author.avatar.url } end end diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index ab3a6be0585..d145131531b 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -98,8 +98,9 @@ - if @merge_request.merged? && @merge_request.merge_event :javascript - mergeObj.author = "#{sanitize(@merge_request.merge_event.author.name)}"; - mergeObj.author_link = "#{user_path(@merge_request.merge_event.author)}"; + mergeObj.author = "#{@merge_request.merge_event.author}"; + mergeObj.author.name = "#{sanatize(@merge_request.merge_event.author.name)}" + mergeObj.author.url = "#{user_path(@merge_request.merge_event.author)}"; mergeObj.avatar = "#{@merge_request.merge_event.author.avatar_url(16)}"; mergeObj.source_branch_unavailable = #{!@merge_request.source_branch_exists? || (params[:delete_source] == 'true')}; mergeObj.target_branch_url = "#{namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch)}"; @@ -125,5 +126,10 @@ mergeObj.merged = #{@merge_request.merged?}; mergeObj.closeURL = "#{merge_request_path(@merge_request, merge_request: { state_event: :close }, format: :json)}"; mergeObj.reopenURL = "#{merge_request_path(@merge_request, merge_request: {state_event: :reopen }, format: :json)}"; + mergeObj.created_at = "#{@merge_request.created_at}"; + mergeObj.created_at = "#{@merge_request.updated_at}"; + mergeObj.orignal_author = "#{@merge_request.author.name}"; + mergeObj.orignal_author_url = "#{user_path(@merge_request.author)}"; + mergeObj.original_author_avatar_url = "#{@merge_request.author.avatar_url(16)}"; MR().init(mergeObj); }); diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml index 288bb2165cb..00763888bcf 100644 --- a/app/views/projects/merge_requests/show/_mr_title.html.haml +++ b/app/views/projects/merge_requests/show/_mr_title.html.haml @@ -5,14 +5,17 @@ Merge Request ##{@merge_request.iid} %span.creator · - opened by #{link_to_member(@project, @merge_request.author, size: 24)} + opened by + %a.author_link{"v-bind:href"=>"state.original_author_url"} + %img.avatar.avatar-inline.s24{width:24, alt:"", "v-bind:src"=>"state.original_author_avatar_url"} + %span.author + {{state.original_author}} · - = time_ago_with_tooltip(@merge_request.created_at) - - if @merge_request.updated_at != @merge_request.created_at - %span - · - = icon('edit', title: 'edited') - = time_ago_with_tooltip(@merge_request.updated_at, placement: 'bottom') + {{state.created_at}} + %span{"v-if"=>"state.created_at != state.updated_at"} + · + = icon('edit', title: 'edited') + {{state.created_at}} .issue-btn-group.pull-right - if can?(current_user, :update_merge_request, @merge_request) |