Download as
Browse Code »

Commit ed0172e0bd36a62e824e94d2aa7465f8d888a6fa

Authored by Caio Salgado + Alessandro Palmeira
Committed by João da Silva
1 parent ec7d4270
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

[Mezuro] Fixed compound_metrics edition

Showing 2 changed files with 13 additions and 13 deletions   Show diff stats
plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb
  Diff comments   View file @ed0172e
... ... @@ -59,17 +59,17 @@ class MezuroPluginMyprofileController < ProfileController
59 59 @configuration_name = params[:configuration_name]
60 60 metric_name = params[:metric][:name]
61 61 metric_configuration = Kalibro::Client::MetricConfigurationClient.new.metric_configuration(@configuration_name, metric_name)
62   - assign_metric_configuration_instance (metric_configuration)
  62 + metric_configuration = assign_metric_configuration_instance (metric_configuration)
63 63 Kalibro::Client::MetricConfigurationClient.new.save(metric_configuration, @configuration_name)
64 64 redirect_to "/#{profile.identifier}/#{@configuration_name.downcase.gsub(/\s/, '-')}"
65 65 end
66 66  
67 67 def update_compound_metric_configuration
68 68 @configuration_name = params[:configuration_name]
69   - metric_name = params[:metric][:name]
70   - metric_configuration = Kalibro::Client::MetricConfigurationClient.new.metric_configuration(@configuration_name, metric_name)
71   - assign_compound_metric_configuration_instance (metric_configuration)
72   - Kalibro::Client::MetricConfigurationClient.new.save(metric_configuration, @configuration_name)
  69 + metric_name = params[:metric_configuration][:metric][:name]
  70 + compound_metric_configuration = Kalibro::Client::MetricConfigurationClient.new.metric_configuration(@configuration_name, metric_name)
  71 + compound_metric_configuration = assign_compound_metric_configuration_instance (compound_metric_configuration)
  72 + Kalibro::Client::MetricConfigurationClient.new.save(compound_metric_configuration, @configuration_name)
73 73 redirect_to "/#{profile.identifier}/#{@configuration_name.downcase.gsub(/\s/, '-')}"
74 74 end
75 75  
... ... @@ -163,10 +163,10 @@ class MezuroPluginMyprofileController < ProfileController
163 163 end
164 164  
165 165 def assign_compound_metric_configuration_instance (metric_configuration)
166   - metric_configuration.metric.name = params[:metric_configuration][:metric_name]
167   - metric_configuration.metric.description = params[:metric_configuration][:description]
168   - metric_configuration.metric.scope = params[:metric_configuration][:scope]
169   - metric_configuration.metric.script = params[:metric_configuration][:script]
  166 + metric_configuration.metric.name = params[:metric_configuration][:metric][:name]
  167 + metric_configuration.metric.description = params[:metric_configuration][:metric][:description]
  168 + metric_configuration.metric.scope = params[:metric_configuration][:metric][:scope]
  169 + metric_configuration.metric.script = params[:metric_configuration][:metric][:script]
170 170 metric_configuration.code = params[:metric_configuration][:code]
171 171 metric_configuration.weight = params[:metric_configuration][:weight]
172 172 metric_configuration.aggregation_form = params[:metric_configuration][:aggregation_form]
... ...
plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb
  Diff comments   View file @ed0172e
1 1 <h2><%= @configuration_name %> Configuration</h2>
2 2  
3   -<% form_for @metric_configuration, :url => {:action =>"update_compound_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
  3 +<% form_for :metric_configuration, :url => {:action =>"update_compound_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
4 4 <%= hidden_field_tag :configuration_name, @configuration_name %>
5 5 <p>
6 6 <%= "Metric Name:" + @metric.name %>
... ... @@ -9,15 +9,15 @@
9 9 <%= m.hidden_field :name, :value => @metric.name %>
10 10 <p>
11 11 <%= m.label :description, "Description:" %>
12   - <%= m.text_field "description" %>
  12 + <%= m.text_field "description", :value => @metric.description %>
13 13 </p>
14 14 <p>
15 15 <%= m.label :scope, "Scope:" %>
16   - <%= m.select :scope, [["Teste", "NIL"], ["Class", "CLASS"]] %>
  16 + <%= m.select :scope, [["Class", "CLASS"]], :selected => @metric.scope %>
17 17 </p>
18 18 <p>
19 19 <%= m.label :script, "Script:" %>
20   - <%= m.text_area "script" %>
  20 + <%= m.text_area "script", :value => @metric.script %>
21 21 </p>
22 22 <% end %>
23 23 <p>
... ...