Download as
Browse Code »

Commit dea59087e9d8c25c1d9147600d9168de6cdb74b4

Authored by Alessandro Palmeira + Diego Araújo
Committed by Paulo Meireles
1 parent b7adb7d6
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

[Mezuro] Fixed ranges with +/- Infinity beginning or end values

Showing 2 changed files with 11 additions and 5 deletions   Show diff stats
plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb
  Diff comments   View file @dea5908
@@ -84,16 +84,14 @@ class MezuroPluginMyprofileController < ProfileController @@ -84,16 +84,14 @@ class MezuroPluginMyprofileController < ProfileController
84 @configuration_content = profile.articles.find(params[:id]) 84 @configuration_content = profile.articles.find(params[:id])
85 @metric_name = params[:metric_name] 85 @metric_name = params[:metric_name]
86 @beginning_id = params[:beginning_id] 86 @beginning_id = params[:beginning_id]
87 -  
88 metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, @metric_name) 87 metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, @metric_name)
89 - @range = metric_configuration.ranges.find{ |range| range.beginning == @beginning_id.to_f } 88 + @range = metric_configuration.ranges.find{|range| range.beginning == @beginning_id.to_f || ( @beginning_id =="-Infinity" && range.beginning == -1.0/0.0) }
90 end 89 end
91 90
92 def create_range 91 def create_range
93 @configuration_content = profile.articles.find(params[:id]) 92 @configuration_content = profile.articles.find(params[:id])
94 @range = Kalibro::Range.new params[:range] 93 @range = Kalibro::Range.new params[:range]
95 metric_name = params[:metric_name] 94 metric_name = params[:metric_name]
96 - beginning_id = params[:beginning_id]  
97 metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, metric_name) 95 metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, metric_name)
98 metric_configuration.add_range(@range) 96 metric_configuration.add_range(@range)
99 metric_configuration.save 97 metric_configuration.save
plugins/mezuro/views/mezuro_plugin_myprofile/_range_form.html.erb
  Diff comments   View file @dea5908
@@ -14,7 +14,11 @@ @@ -14,7 +14,11 @@
14 <%= f.label :beginning, "(*) Beginning:" %> 14 <%= f.label :beginning, "(*) Beginning:" %>
15 </td> 15 </td>
16 <td> 16 <td>
17 - <%= f.text_field :beginning %> 17 + <% if @range.beginning.to_s == "-Infinity" %>
  18 + <%= f.text_field :beginning, :value => "-INF" %>
  19 + <% else %>
  20 + <%= f.text_field :beginning %>
  21 + <% end %>
18 </td> 22 </td>
19 </tr> 23 </tr>
20 <tr> 24 <tr>
@@ -22,7 +26,11 @@ @@ -22,7 +26,11 @@
22 <%= f.label :end, "(*) End:" %> 26 <%= f.label :end, "(*) End:" %>
23 </td> 27 </td>
24 <td> 28 <td>
25 - <%= f.text_field :end %> 29 + <% if @range.end.to_s == "Infinity" %>
  30 + <%= f.text_field :end, :value => "INF" %>
  31 + <% else %>
  32 + <%= f.text_field :end %>
  33 + <% end %>
26 </td> 34 </td>
27 </tr> 35 </tr>
28 <tr> 36 <tr>