From ed0172e0bd36a62e824e94d2aa7465f8d888a6fa Mon Sep 17 00:00:00 2001
From: Caio Salgado + Alessandro Palmeira <caio.csalgado@gmail.com>
Date: Thu, 31 May 2012 17:25:42 -0300
Subject: [PATCH] [Mezuro] Fixed compound_metrics edition

---
 plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb                         | 18 +++++++++---------
 plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb b/plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb
index 1926b22..e8fa986 100644
--- a/plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb
+++ b/plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb
@@ -59,17 +59,17 @@ class MezuroPluginMyprofileController < ProfileController
     @configuration_name = params[:configuration_name]
     metric_name = params[:metric][:name]
     metric_configuration = Kalibro::Client::MetricConfigurationClient.new.metric_configuration(@configuration_name, metric_name)  
-    assign_metric_configuration_instance (metric_configuration)
+    metric_configuration = assign_metric_configuration_instance (metric_configuration)
     Kalibro::Client::MetricConfigurationClient.new.save(metric_configuration, @configuration_name)
     redirect_to "/#{profile.identifier}/#{@configuration_name.downcase.gsub(/\s/, '-')}"
   end
 
   def update_compound_metric_configuration
     @configuration_name = params[:configuration_name]
-    metric_name = params[:metric][:name]
-    metric_configuration = Kalibro::Client::MetricConfigurationClient.new.metric_configuration(@configuration_name, metric_name)  
-    assign_compound_metric_configuration_instance (metric_configuration)
-    Kalibro::Client::MetricConfigurationClient.new.save(metric_configuration, @configuration_name)
+    metric_name = params[:metric_configuration][:metric][:name]
+    compound_metric_configuration = Kalibro::Client::MetricConfigurationClient.new.metric_configuration(@configuration_name, metric_name)  
+    compound_metric_configuration = assign_compound_metric_configuration_instance (compound_metric_configuration)
+    Kalibro::Client::MetricConfigurationClient.new.save(compound_metric_configuration, @configuration_name)
     redirect_to "/#{profile.identifier}/#{@configuration_name.downcase.gsub(/\s/, '-')}"
   end
   
@@ -163,10 +163,10 @@ class MezuroPluginMyprofileController < ProfileController
   end
 
   def assign_compound_metric_configuration_instance (metric_configuration)   
-    metric_configuration.metric.name = params[:metric_configuration][:metric_name]
-    metric_configuration.metric.description = params[:metric_configuration][:description]
-    metric_configuration.metric.scope = params[:metric_configuration][:scope]
-    metric_configuration.metric.script = params[:metric_configuration][:script]
+    metric_configuration.metric.name = params[:metric_configuration][:metric][:name]
+    metric_configuration.metric.description = params[:metric_configuration][:metric][:description]
+    metric_configuration.metric.scope = params[:metric_configuration][:metric][:scope]
+    metric_configuration.metric.script = params[:metric_configuration][:metric][:script]
     metric_configuration.code = params[:metric_configuration][:code]
     metric_configuration.weight = params[:metric_configuration][:weight]
     metric_configuration.aggregation_form = params[:metric_configuration][:aggregation_form]
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb
index a7dcd6c..a555f86 100644
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb
@@ -1,6 +1,6 @@
 <h2><%= @configuration_name %> Configuration</h2>
 
-<% form_for @metric_configuration, :url => {:action =>"update_compound_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
+<% form_for :metric_configuration, :url => {:action =>"update_compound_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
   <%= hidden_field_tag :configuration_name, @configuration_name %>
   <p>
     <%= "Metric Name:" + @metric.name %>   
@@ -9,15 +9,15 @@
     <%= m.hidden_field :name, :value => @metric.name %>
     <p>
       <%= m.label :description, "Description:" %>
-      <%= m.text_field "description" %>
+      <%= m.text_field "description", :value => @metric.description %>
     </p>
     <p>
       <%= m.label :scope, "Scope:" %>
-      <%= m.select :scope, [["Teste", "NIL"], ["Class", "CLASS"]] %>
+      <%= m.select :scope, [["Class", "CLASS"]], :selected => @metric.scope %>
     </p>
     <p>
       <%= m.label :script, "Script:" %>
-      <%= m.text_area "script" %>
+      <%= m.text_area "script", :value => @metric.script %>
     </p>
   <% end %>
   <p>
--
libgit2 0.21.2