ReviewData changed into ReviewComment : OK

7 files changed, 23 insertions, 27 deletions

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb
index 41eb70554b7..6f491007194 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb
@@ -195,7 +195,7 @@ class ResourceController < ApplicationController
       end
     end
 
-    RuleFailure.find(:all, :include => ['rule', 'reviews', { 'reviews' => 'review_data' } ], :conditions => [conditions] + values, :order => 'failure_level DESC').each do |violation|
+    RuleFailure.find(:all, :include => ['rule', 'reviews' ], :conditions => [conditions] + values, :order => 'failure_level DESC').each do |violation|
       # sorted by severity => from blocker to info
       if violation.line && violation.line>0 && @lines
         @lines[violation.line-1].add_violation(violation)
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 e78b99580be..36e2c12a22c 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
@@ -29,10 +29,10 @@ class ReviewsController < ApplicationController
 	  @review = Review.new
 	  @review.rule_failure_id = params[:violation_id]
 	  @review.user = current_user
-	  @review_data = ReviewData.new
-	  @review_data.user = current_user
-	  @review_data.review = @review
-	  @review_data.review_text = "Enter your review here"
+	  @review_comment = ReviewComment.new
+	  @review_comment.user = current_user
+	  @review_comment.review = @review
+	  @review_comment.review_text = "Enter your review here"
 	  render "_form", :layout => false
 	end
 	
@@ -40,11 +40,11 @@ class ReviewsController < ApplicationController
 	  review = Review.new(params[:review])
 	  review.user = current_user
 	  review.save
-      review_data = ReviewData.new(params[:review_data])
-	  review_data.user = current_user
-	  review_data.review_id = review.id
-	  review_data.save
-	  #render "_view", :layout => false
+      review_comment = ReviewComment.new(params[:review_comment])
+	  review_comment.user = current_user
+	  review_comment.review_id = review.id
+	  review_comment.save
+	  render "create", :layout => false
 	end
 	
 	def cancel_create
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/review.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/review.rb
index eea61dffc9c..661227a8fba 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/review.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/review.rb
@@ -21,7 +21,7 @@ class Review < ActiveRecord::Base
   belongs_to :user
   belongs_to :rule_failure
   belongs_to :resource, :class_name => 'Project', :foreign_key => 'resource_id'
-  has_many :review_data, :order => "created_at", :dependent => :destroy
+  has_many :review_comments, :order => "created_at", :dependent => :destroy
   validates_presence_of :user
   validates_presence_of :review_type
   validates_presence_of :status
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/review_data.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/review_comment.rb
index a0b250ea30d..d763ae2d426 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/review_data.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/review_comment.rb
@@ -17,9 +17,7 @@
 # License along with Sonar; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
 #
-class ReviewData < ActiveRecord::Base
-  set_table_name :review_data
-
+class ReviewComment < ActiveRecord::Base
   belongs_to :user
   belongs_to :review
   validates_presence_of :user
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 b26e64c846a..334699da652 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
@@ -12,7 +12,7 @@
       <br/>
       Comment:
       <br/>
-      <%= text_area :review_data, :review_text, :rows => 10 %>
+      <%= text_area :review_comment, :review_text, :rows => 10 %>
       <br/>
       <%= submit_to_remote 'create_btn', 'Create review', 
                      :url => { :action => 'create', :id => @review.id },
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 1541b84399b..32dc6c4ed7b 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
@@ -1,21 +1,19 @@
 <div>
-      Review Id: <%= review.id -%>
+      User name: <%= h(review.user.name) -%>
       <br/>
-      Review Id: <%= review.user.name -%>
+      Status: <%= h(review.status) -%>
       <br/>
-      Review type: <%= review.review_type -%>
+      Severity: <%= h(review.severity) -%>
       <br/>
-      Status: <%= review.status -%>
-      <br/>
-      Severity: <%= review.severity -%>
-      <br/>
-      External Link: <%= review.external_link -%>
+      External Link: <%= h(review.external_link) -%>
       <br/>
       
-		  <% unless review.review_data.blank? 
-		       review.review_data.each do |review_data|
+		  <% unless review.review_comments.blank? 
+		       review.review_comments.each do |review_comment|
 		  %>
-		    Comment: <%= review_data.review_text -%>
+		    <%= l review_comment.created_at -%>, by <%= h(review_comment.user.name) -%>
+		    » 
+		    <%= h(review_comment.review_text) -%>
             <br/>
 		  <% 
 		       end
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 378b69db968..c6c7d764e78 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
@@ -36,7 +36,7 @@ class CreateReview < ActiveRecord::Migration
       t.column 'resource_line', 	:integer, 	:null => true      
     end
     
-    create_table 'review_data' do |t|
+    create_table 'review_comments' do |t|
       t.column 'created_at', 		:datetime
       t.column 'review_id', 		:integer
       t.column 'user_id', 			:integer, 	:null => true