diff options
| author | Marius Mathiesen <marius@shortcut.no> | 2009-10-07 15:09:03 +0200 |
|---|---|---|
| committer | Johan Sørensen <johan@johansorensen.com> | 2009-11-04 15:22:55 +0100 |
| commit | 86fc1c26a6d86bcb18f405888f379b60749b9d6d (patch) | |
| tree | a0004ed76345788f36aa66e5ba0aef0d5deff581 /app | |
| parent | b9d1de854f003c1cc5c81766dbf3ef09895c8245 (diff) | |
| download | gitorious-mainline-outdated-86fc1c26a6d86bcb18f405888f379b60749b9d6d.zip gitorious-mainline-outdated-86fc1c26a6d86bcb18f405888f379b60749b9d6d.tar.gz gitorious-mainline-outdated-86fc1c26a6d86bcb18f405888f379b60749b9d6d.tar.bz2 | |
Adding support for commenting on a merge request version (UI still needs some love)
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/comments_controller.rb | 6 | ||||
| -rw-r--r-- | app/views/merge_request_versions/_merge_request_version.html.erb | 28 |
2 files changed, 31 insertions, 3 deletions
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index 1e6a9ac..bce1d87 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -79,10 +79,10 @@ class CommentsController < ApplicationController end def find_polymorphic_parent - if params[:merge_request_id] - @target = @repository.merge_requests.find(params[:merge_request_id]) - elsif params[:merge_request_version_id] + if params[:merge_request_version_id] @target = MergeRequestVersion.find(params[:merge_request_version_id]) + elsif params[:merge_request_id] + @target = @repository.merge_requests.find(params[:merge_request_id]) else @target = @repository end diff --git a/app/views/merge_request_versions/_merge_request_version.html.erb b/app/views/merge_request_versions/_merge_request_version.html.erb index 48449b7..d1d32bb 100644 --- a/app/views/merge_request_versions/_merge_request_version.html.erb +++ b/app/views/merge_request_versions/_merge_request_version.html.erb @@ -54,6 +54,34 @@ </div> <% end -%> +<div> +<% form_for(@version.comments.build, :url => repo_owner_path(@version.merge_request.target_repository, + [ + @version.merge_request.target_repository.project, + @version.merge_request.target_repository, + @version.merge_request, @version, :comments])) do |f| -%> +<p> + <%= f.label :body -%> + <%= f.text_area :body -%> +</p> +<p> + <%= f.label :lines -%> + <%= text_field :comment, :lines -%> +</p> +<p> + <%= f.label :path -%> + <%= f.text_field :path -%> +</p> +<p> + <%= f.label :sha1 -%> + <%= f.text_field :sha1 -%> +</p> +<p> + <%= f.submit -%> +</p> +<% end -%> +</div> + <%= render_inline_diffs_controls("merge-requests") %> <%= render_inline_diffs_with_stats(diffs){|file|@version.comments_for_path_and_sha(file.a_path, @sha_range)} -%> |