diff options
| author | Fabrice Bellingard <bellingard@gmail.com> | 2011-04-07 17:00:22 +0200 |
|---|---|---|
| committer | Fabrice Bellingard <bellingard@gmail.com> | 2011-04-20 08:49:57 +0200 |
| commit | 1c816c3c0b26000a2db621a896690270d2527a89 (patch) | |
| tree | 36460be3b4b3250bfa7b3914423cc7d638139b28 /sonar-server | |
| parent | e2ae34f02f95e9b9709637104e91aa6276ac6893 (diff) | |
| download | sonarqube-1c816c3c0b26000a2db621a896690270d2527a89.tar.gz sonarqube-1c816c3c0b26000a2db621a896690270d2527a89.zip | |
[SONAR-1973] Adds validation, improves form & removes unused
"external_link"
Diffstat (limited to 'sonar-server')
5 files changed, 4 insertions, 11 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/reviews_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/reviews_controller.rb index 1b1ae8e0676..5d189373687 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/reviews_controller.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/reviews_controller.rb @@ -50,6 +50,8 @@ class ReviewsController < ApplicationController def create review = Review.new(params[:review]) review.user = current_user + review.status = "open" + review.review_type = "simple" review_comment = ReviewComment.new(params[:review_comment]) review_comment.user = current_user review.review_comments << review_comment diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_form.html.erb index ddbd5aa8780..0cd174a4d7c 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_form.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_form.html.erb @@ -1,16 +1,10 @@ <h3>Create a new review</h3> <% form_for :review, @review do |f| %> <%= f.hidden_field :rule_failure_id %> - Review by: <%= @review.user.login -%> - <br/> - Review type: <%= f.text_field :review_type %> - <br/> - Status: <%= f.text_field :status %> + Review made by: <%= @review.user.name -%> <br/> Severity: <%= f.text_field :severity %> <br/> - External Link: <%= f.text_field :external_link %> - <br/> Comment: <br/> <%= text_area :review_comment, :review_text, :id => "reviewText", :rows => 10 %> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_form_comment.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_form_comment.html.erb index 59420400668..f9056660f9a 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_form_comment.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_form_comment.html.erb @@ -1,6 +1,6 @@ <% form_for :review_comment, @review_comment do |f| %> <%= f.hidden_field :review_id %> - Review by: <%= :user -%> + Review by: <%= @review_comment.user.name -%> <br/> Comment: <br/> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_view.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_view.html.erb index 7d3a07a3f06..b06f1d99355 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_view.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/_view.html.erb @@ -5,8 +5,6 @@ <br/> Severity: <%= h(review.severity) -%> <br/> - External Link: <%= h(review.external_link) -%> - <br/> <div> <% unless review.review_comments.blank? diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/190_create_review.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/190_create_review.rb index c6c7d764e78..4ef60d38e60 100644 --- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/190_create_review.rb +++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/190_create_review.rb @@ -30,7 +30,6 @@ class CreateReview < ActiveRecord::Migration t.column 'review_type', :string, :null => true, :limit => 10 t.column 'status', :string, :null => true, :limit => 10 t.column 'severity', :string, :null => true, :limit => 10 - t.column 'external_link', :string, :null => true, :limit => 200 t.column 'rule_failure_id', :integer, :null => true t.column 'resource_id', :integer, :null => true t.column 'resource_line', :integer, :null => true |