[Mezuro] Merge branch 'validations' into mezuro-dev

Conflicts: plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb

[Mezuro] Merge branch 'validations' into mezuro-dev
Conflicts: plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
João M. M. da Silva + Alessandro Palmeira + Diego Araújo · João M. M. da Silva
2 parents 7e9e630f b5c3370f
Showing 3 changed files with 61 additions and 31 deletions Show diff stats
plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb
plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
plugins/mezuro/public/javascripts/validations.js
@@ -31,7 +31,9 @@ class MezuroPluginMyprofileController &lt; ProfileController
   def new_compound_metric_configuration
     @configuration_content = profile.articles.find(params[:id])
     @metric_configurations = @configuration_content.metric_configurations
-    look_for_configuration_content_errors
+    if configuration_content_has_errors?
+      redirect_to_error_page @configuration_content.errors[:base]
+    end
   end
   def edit_metric_configuration
@@ -50,8 +52,13 @@ class MezuroPluginMyprofileController &lt; ProfileController
   def create_metric_configuration
     id = params[:id]
     metric_name = params[:metric_configuration][:metric][:name]
-    (Kalibro::MetricConfiguration.new(params[:metric_configuration])).save
-    redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/edit_metric_configuration?id=#{id}&metric_name=#{metric_name.gsub(/\s/, '+')}"
+    metric_configuration = Kalibro::MetricConfiguration.new(params[:metric_configuration])
+    metric_configuration.save
+    if metric_configuration_has_errors? metric_configuration
+      redirect_to_error_page metric_configuration.errors[0].message
+    else
+      redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/edit_metric_configuration?id=#{id}&metric_name=#{metric_name.gsub(/\s/, '+')}"
+    end
   end
   def create_compound_metric_configuration
@@ -59,8 +66,11 @@ class MezuroPluginMyprofileController &lt; ProfileController
     metric_name = params[:metric_configuration][:metric][:name]
     metric_configuration = Kalibro::MetricConfiguration.new(params[:metric_configuration])
     metric_configuration.save
-    look_for_model_error metric_configuration
-    redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/edit_compound_metric_configuration?id=#{id}&metric_name=#{metric_name.gsub(/\s/, '+')}"
+    if metric_configuration_has_errors? metric_configuration
+      redirect_to_error_page metric_configuration.errors[0].message
+    else
+      redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/edit_compound_metric_configuration?id=#{id}&metric_name=#{metric_name.gsub(/\s/, '+')}"
+    end
   end
   def update_metric_configuration
@@ -68,8 +78,11 @@ class MezuroPluginMyprofileController &lt; ProfileController
     metric_name = params[:metric_configuration][:metric][:name]
     metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, metric_name)
     metric_configuration.update_attributes params[:metric_configuration]
-    look_for_model_error metric_configuration
-    redirect_to "/#{profile.identifier}/#{@configuration_content.slug}"
+    if metric_configuration_has_errors? metric_configuration
+      redirect_to_error_page metric_configuration.errors[0].message
+    else
+      redirect_to "/#{profile.identifier}/#{@configuration_content.slug}"
+    end
   end
   def update_compound_metric_configuration
@@ -77,8 +90,11 @@ class MezuroPluginMyprofileController &lt; ProfileController
     metric_name = params[:metric_configuration][:metric][:name]
     metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, metric_name)
     metric_configuration.update_attributes params[:metric_configuration]
-    look_for_model_error metric_configuration
-    redirect_to "/#{profile.identifier}/#{@configuration_content.slug}"
+    if metric_configuration_has_errors? metric_configuration
+      redirect_to_error_page metric_configuration.errors[0].message
+    else
+      redirect_to "/#{profile.identifier}/#{@configuration_content.slug}"
+    end
   end
   def remove_metric_configuration
@@ -86,8 +102,11 @@ class MezuroPluginMyprofileController &lt; ProfileController
     metric_name = params[:metric_name]
     metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(configuration_content.name, metric_name)
     metric_configuration.destroy
-    look_for_model_error metric_configuration
-    redirect_to "/#{profile.identifier}/#{configuration_content.slug}"
+    if metric_configuration_has_errors? metric_configuration
+      redirect_to_error_page metric_configuration.errors[0].message
+    else
+      redirect_to "/#{profile.identifier}/#{configuration_content.slug}"
+    end
   end
   def new_range
@@ -111,7 +130,9 @@ class MezuroPluginMyprofileController &lt; ProfileController
     metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, metric_name)   
     metric_configuration.add_range(@range)
     metric_configuration.save
-    look_for_model_error metric_configuration
+    if metric_configuration_has_errors? metric_configuration
+      redirect_to_error_page metric_configuration.errors[0].message
+    end
   end
   def update_range
@@ -122,7 +143,9 @@ class MezuroPluginMyprofileController &lt; ProfileController
     index = metric_configuration.ranges.index{ |range| range.beginning == beginning_id.to_f || beginning_id == "-INF" }
     metric_configuration.ranges[index] = Kalibro::Range.new params[:range]
     metric_configuration.save
-    look_for_model_error metric_configuration
+    if metric_configuration_has_errors? metric_configuration
+      redirect_to_error_page metric_configuration.errors[0].message
+    end
   end
   def remove_range
@@ -132,27 +155,32 @@ class MezuroPluginMyprofileController &lt; ProfileController
     metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(configuration_content.name, metric_name)
     metric_configuration.ranges.delete_if { |range| range.beginning == beginning_id.to_f || beginning_id == "-INF" }
     metric_configuration.save
-
-    formatted_metric_name = metric_name.gsub(/\s/, '+')
-    if metric_configuration.metric.class == Kalibro::CompoundMetric
-      redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/edit_compound_metric_configuration?id=#{configuration_content.id}&metric_name=#{formatted_metric_name}"
+    if metric_configuration_has_errors? metric_configuration
+      redirect_to_error_page metric_configuration.errors[0].message
     else
-      redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/edit_metric_configuration?id=#{configuration_content.id}&metric_name=#{formatted_metric_name}"
+      formatted_metric_name = metric_name.gsub(/\s/, '+')
+      if metric_configuration.metric.class == Kalibro::CompoundMetric
+        redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/edit_compound_metric_configuration?id=#{configuration_content.id}&metric_name=#{formatted_metric_name}"
+      else
+        redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/edit_metric_configuration?id=#{configuration_content.id}&metric_name=#{formatted_metric_name}"
+      end
     end
   end
   private
   def redirect_to_error_page(message)
+    message = URI.escape(CGI.escape(message),'.')
     redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/error_page?message=#{message}"
   end
-  def look_for_configuration_content_errors
-    redirect_to_error_page(@configuration_content.errors[:base]) if not @configuration_content.errors[:base].nil?
+
+  def configuration_content_has_errors?
+    not @configuration_content.errors[:base].nil?
   end
-  def look_for_model_error(model)
-    redirect_to_error_page(model.errors[0].message) if not model.errors.empty?
+  def metric_configuration_has_errors? metric_configuration
+    not metric_configuration.errors.empty?
   end
 end
@@ -9,7 +9,7 @@ class MezuroPluginProfileController &lt; ProfileController
   def project_state
     @content = profile.articles.find(params[:id])
     project = @content.project
-    if project_content_errors?
+    if project_content_has_errors?
       redirect_to_error_page(@content.errors[:base])
     else
       state = project.kalibro_error.nil? ? project.state : "ERROR"
@@ -20,7 +20,7 @@ class MezuroPluginProfileController &lt; ProfileController
   def project_error
     @content = profile.articles.find(params[:id])
     @project = @content.project
-    if project_content_errors?
+    if project_content_has_errors?
       redirect_to_error_page(@content.errors[:base])
     else
       render :partial => 'content_viewer/project_error'
@@ -31,7 +31,7 @@ class MezuroPluginProfileController &lt; ProfileController
     @content = profile.articles.find(params[:id])
     date = params[:date]
     @project_result = date.nil? ? @content.project_result : @content.project_result_with_date(date)
-    if project_content_errors?
+    if project_content_has_errors?
       redirect_to_error_page(@content.errors[:base])
     else
       render :partial => 'content_viewer/project_result'
@@ -41,7 +41,7 @@ class MezuroPluginProfileController &lt; ProfileController
   def module_result
     @content = profile.articles.find(params[:id])
     @module_result = @content.module_result(params)
-    if project_content_errors?
+    if project_content_has_errors?
       redirect_to_error_page(@content.errors[:base])
     else
       render :partial => 'content_viewer/module_result'
@@ -53,7 +53,7 @@ class MezuroPluginProfileController &lt; ProfileController
     date = params[:date]
     project_result = date.nil? ? @content.project_result : @content.project_result_with_date(date)
     @project_name = @content.project.name if not @content.project.nil?
-    if project_content_errors?
+    if project_content_has_errors?
       redirect_to_error_page(@content.errors[:base])
     else
       @source_tree = project_result.node_of(params[:module_name])
@@ -65,7 +65,7 @@ class MezuroPluginProfileController &lt; ProfileController
     metric_name = params[:metric_name]
     @content = profile.articles.find(params[:id])
     module_history = @content.result_history(params[:module_name])
-    if project_content_errors?
+    if project_content_has_errors?
       redirect_to_error_page(@content.errors[:base])
     else
       @score_history = filtering_metric_history(metric_name, module_history)
@@ -76,7 +76,7 @@ class MezuroPluginProfileController &lt; ProfileController
   def module_grade_history
     @content = profile.articles.find(params[:id])
     modules_results = @content.result_history(params[:module_name])
-    if project_content_errors?
+    if project_content_has_errors?
       redirect_to_error_page(@content.errors[:base])
     else
       @score_history = modules_results.collect { |module_result| module_result.grade }
@@ -104,7 +104,7 @@ class MezuroPluginProfileController &lt; ProfileController
     redirect_to "/profile/#{profile.identifier}/plugin/mezuro/error_page?message=#{message}"
   end
-  def project_content_errors?
+  def project_content_has_errors?
     not @content.errors[:base].nil?
   end
 end
@@ -3,7 +3,9 @@ jQuery(function (){
   jQuery('#metric_configuration_submit').live("click", validate_metric_configuration);
 });
-
+function validate_code(code){
+  return true;
+}
 function validate_metric_configuration(){
     var code = jQuery('#metric_configuration_code').val();
	@@ -9,7 +9,7 @@ class MezuroPluginProfileController < ProfileController		@@ -9,7 +9,7 @@ class MezuroPluginProfileController < ProfileController
9	def project_state	9	def project_state
10	@content = profile.articles.find(params[:id])	10	@content = profile.articles.find(params[:id])
11	project = @content.project	11	project = @content.project
12	- if project_content_errors?	12	+ if project_content_has_errors?
13	redirect_to_error_page(@content.errors[:base])	13	redirect_to_error_page(@content.errors[:base])
14	else	14	else
15	state = project.kalibro_error.nil? ? project.state : "ERROR"	15	state = project.kalibro_error.nil? ? project.state : "ERROR"
	@@ -20,7 +20,7 @@ class MezuroPluginProfileController < ProfileController		@@ -20,7 +20,7 @@ class MezuroPluginProfileController < ProfileController
20	def project_error	20	def project_error
21	@content = profile.articles.find(params[:id])	21	@content = profile.articles.find(params[:id])
22	@project = @content.project	22	@project = @content.project
23	- if project_content_errors?	23	+ if project_content_has_errors?
24	redirect_to_error_page(@content.errors[:base])	24	redirect_to_error_page(@content.errors[:base])
25	else	25	else
26	render :partial => 'content_viewer/project_error'	26	render :partial => 'content_viewer/project_error'
	@@ -31,7 +31,7 @@ class MezuroPluginProfileController < ProfileController		@@ -31,7 +31,7 @@ class MezuroPluginProfileController < ProfileController
31	@content = profile.articles.find(params[:id])	31	@content = profile.articles.find(params[:id])
32	date = params[:date]	32	date = params[:date]
33	@project_result = date.nil? ? @content.project_result : @content.project_result_with_date(date)	33	@project_result = date.nil? ? @content.project_result : @content.project_result_with_date(date)
34	- if project_content_errors?	34	+ if project_content_has_errors?
35	redirect_to_error_page(@content.errors[:base])	35	redirect_to_error_page(@content.errors[:base])
36	else	36	else
37	render :partial => 'content_viewer/project_result'	37	render :partial => 'content_viewer/project_result'
	@@ -41,7 +41,7 @@ class MezuroPluginProfileController < ProfileController		@@ -41,7 +41,7 @@ class MezuroPluginProfileController < ProfileController
41	def module_result	41	def module_result
42	@content = profile.articles.find(params[:id])	42	@content = profile.articles.find(params[:id])
43	@module_result = @content.module_result(params)	43	@module_result = @content.module_result(params)
44	- if project_content_errors?	44	+ if project_content_has_errors?
45	redirect_to_error_page(@content.errors[:base])	45	redirect_to_error_page(@content.errors[:base])
46	else	46	else
47	render :partial => 'content_viewer/module_result'	47	render :partial => 'content_viewer/module_result'
	@@ -53,7 +53,7 @@ class MezuroPluginProfileController < ProfileController		@@ -53,7 +53,7 @@ class MezuroPluginProfileController < ProfileController
53	date = params[:date]	53	date = params[:date]
54	project_result = date.nil? ? @content.project_result : @content.project_result_with_date(date)	54	project_result = date.nil? ? @content.project_result : @content.project_result_with_date(date)
55	@project_name = @content.project.name if not @content.project.nil?	55	@project_name = @content.project.name if not @content.project.nil?
56	- if project_content_errors?	56	+ if project_content_has_errors?
57	redirect_to_error_page(@content.errors[:base])	57	redirect_to_error_page(@content.errors[:base])
58	else	58	else
59	@source_tree = project_result.node_of(params[:module_name])	59	@source_tree = project_result.node_of(params[:module_name])
	@@ -65,7 +65,7 @@ class MezuroPluginProfileController < ProfileController		@@ -65,7 +65,7 @@ class MezuroPluginProfileController < ProfileController
65	metric_name = params[:metric_name]	65	metric_name = params[:metric_name]
66	@content = profile.articles.find(params[:id])	66	@content = profile.articles.find(params[:id])
67	module_history = @content.result_history(params[:module_name])	67	module_history = @content.result_history(params[:module_name])
68	- if project_content_errors?	68	+ if project_content_has_errors?
69	redirect_to_error_page(@content.errors[:base])	69	redirect_to_error_page(@content.errors[:base])
70	else	70	else
71	@score_history = filtering_metric_history(metric_name, module_history)	71	@score_history = filtering_metric_history(metric_name, module_history)
	@@ -76,7 +76,7 @@ class MezuroPluginProfileController < ProfileController		@@ -76,7 +76,7 @@ class MezuroPluginProfileController < ProfileController
76	def module_grade_history	76	def module_grade_history
77	@content = profile.articles.find(params[:id])	77	@content = profile.articles.find(params[:id])
78	modules_results = @content.result_history(params[:module_name])	78	modules_results = @content.result_history(params[:module_name])
79	- if project_content_errors?	79	+ if project_content_has_errors?
80	redirect_to_error_page(@content.errors[:base])	80	redirect_to_error_page(@content.errors[:base])
81	else	81	else
82	@score_history = modules_results.collect { \|module_result\| module_result.grade }	82	@score_history = modules_results.collect { \|module_result\| module_result.grade }
	@@ -104,7 +104,7 @@ class MezuroPluginProfileController < ProfileController		@@ -104,7 +104,7 @@ class MezuroPluginProfileController < ProfileController
104	redirect_to "/profile/#{profile.identifier}/plugin/mezuro/error_page?message=#{message}"	104	redirect_to "/profile/#{profile.identifier}/plugin/mezuro/error_page?message=#{message}"
105	end	105	end
106		106
107	- def project_content_errors?	107	+ def project_content_has_errors?
108	not @content.errors[:base].nil?	108	not @content.errors[:base].nil?
109	end	109	end
110	end	110	end