From dea59087e9d8c25c1d9147600d9168de6cdb74b4 Mon Sep 17 00:00:00 2001 From: Alessandro Palmeira + Diego Araújo Date: Fri, 20 Jul 2012 16:10:59 -0300 Subject: [PATCH] [Mezuro] Fixed ranges with +/- Infinity beginning or end values --- plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb | 4 +--- plugins/mezuro/views/mezuro_plugin_myprofile/_range_form.html.erb | 12 ++++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb b/plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb index 931d27d..5ea3789 100644 --- a/plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb +++ b/plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb @@ -84,16 +84,14 @@ class MezuroPluginMyprofileController < ProfileController @configuration_content = profile.articles.find(params[:id]) @metric_name = params[:metric_name] @beginning_id = params[:beginning_id] - metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, @metric_name) - @range = metric_configuration.ranges.find{ |range| range.beginning == @beginning_id.to_f } + @range = metric_configuration.ranges.find{|range| range.beginning == @beginning_id.to_f || ( @beginning_id =="-Infinity" && range.beginning == -1.0/0.0) } end def create_range @configuration_content = profile.articles.find(params[:id]) @range = Kalibro::Range.new params[:range] metric_name = params[:metric_name] - beginning_id = params[:beginning_id] metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, metric_name) metric_configuration.add_range(@range) metric_configuration.save diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/_range_form.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/_range_form.html.erb index 9d6db84..53ed8e5 100644 --- a/plugins/mezuro/views/mezuro_plugin_myprofile/_range_form.html.erb +++ b/plugins/mezuro/views/mezuro_plugin_myprofile/_range_form.html.erb @@ -14,7 +14,11 @@ <%= f.label :beginning, "(*) Beginning:" %> - <%= f.text_field :beginning %> + <% if @range.beginning.to_s == "-Infinity" %> + <%= f.text_field :beginning, :value => "-INF" %> + <% else %> + <%= f.text_field :beginning %> + <% end %> @@ -22,7 +26,11 @@ <%= f.label :end, "(*) End:" %> - <%= f.text_field :end %> + <% if @range.end.to_s == "Infinity" %> + <%= f.text_field :end, :value => "INF" %> + <% else %> + <%= f.text_field :end %> + <% end %> -- libgit2 0.21.2