[SONAR-1973] Adds validation, improves form & removes unused

"external_link"

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 1b1ae8e06767aa810cbe169e25d435de7eed0cca..5d18937368752efafba3ea19a70ee4e9c6098381 100644 (file)
--- 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 ddbd5aa878037e506c4c3bd7bbeadddc9c314a66..0cd174a4d7c59699bb58c48dec1763d9e5f71e06 100644 (file)
--- 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 59420400668989a4c0ca0ba66b7edde30ca9fe51..f9056660f9a353b8c5eb825d0996e71c462214ef 100644 (file)
--- 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 7d3a07a3f0643cb90ab33ffa4cd1e17cae89e3de..b06f1d99355e4214b33ebee70b74668d972a7817 100644 (file)
--- 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 c6c7d764e78cbd482a03f77f2486c69b7b44a643..4ef60d38e60819215a6a3729c282c9b8f0bd6153 100644 (file)
--- 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