Download as
Browse Code »

Commit ed0bfc149c78ff52ce79a9bd02cb39e95b8a5c46

Authored by Alessandro Palmeira + Caio Salgado
Committed by Paulo Meireles
1 parent c9898c9f
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

[Mezuro] Fixed to_hash from metric_configuration to work without parameters

Showing 2 changed files with 6 additions and 3 deletions   Show diff stats
plugins/mezuro/lib/kalibro/metric_configuration.rb
  Diff comments   View file @ed0bfc1
@@ -51,7 +51,7 @@ class Kalibro::MetricConfiguration < Kalibro::Model @@ -51,7 +51,7 @@ class Kalibro::MetricConfiguration < Kalibro::Model
51 def save 51 def save
52 begin 52 begin
53 self.class.request("MetricConfiguration", :save_metric_configuration, { 53 self.class.request("MetricConfiguration", :save_metric_configuration, {
54 - :metric_configuration => to_hash(:except => [:configuration_name]), 54 + :metric_configuration => to_hash,
55 :configuration_name => configuration_name}) 55 :configuration_name => configuration_name})
56 true 56 true
57 rescue Exception => error 57 rescue Exception => error
@@ -65,7 +65,10 @@ class Kalibro::MetricConfiguration < Kalibro::Model @@ -65,7 +65,10 @@ class Kalibro::MetricConfiguration < Kalibro::Model
65 :metric_name=> metric.name 65 :metric_name=> metric.name
66 }) 66 })
67 end 67 end
68 - 68 +
  69 + def to_hash
  70 + super :except => [:configuration_name]
  71 + end
69 72
70 private 73 private
71 74
plugins/mezuro/test/unit/kalibro/metric_configuration_test.rb
  Diff comments   View file @ed0bfc1
@@ -19,7 +19,7 @@ class MetricConfigurationTest < ActiveSupport::TestCase @@ -19,7 +19,7 @@ class MetricConfigurationTest < ActiveSupport::TestCase
19 end 19 end
20 20
21 should 'convert metric configuration to hash' do 21 should 'convert metric configuration to hash' do
22 - assert_equal @native_metric_configuration_hash, @native_metric_configuration.to_hash(:except => [:configuration_name]) 22 + assert_equal @native_metric_configuration_hash, @native_metric_configuration.to_hash()
23 end 23 end
24 24
25 should 'create appropriate metric type' do 25 should 'create appropriate metric type' do