From a6cc76e43388f9f77a23ebf2942b71a91eda4e3d Mon Sep 17 00:00:00 2001
From: João M. M. da Silva + Diego Araújo
Date: Tue, 17 Jul 2012 16:45:18 -0300
Subject: [PATCH] [Mezuro] Refactored configuration with tests
---
plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb | 22 +++++++++++-----------
plugins/mezuro/lib/kalibro/metric_configuration.rb | 2 +-
plugins/mezuro/test/fixtures/configuration_fixtures.rb | 2 +-
plugins/mezuro/test/functional/mezuro_plugin_myprofile_controller_test.rb | 267 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------
plugins/mezuro/views/mezuro_plugin_myprofile/_range.html.erb | 2 +-
plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb | 4 ++--
6 files changed, 167 insertions(+), 132 deletions(-)
diff --git a/plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb b/plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb
index d94e965..931d27d 100644
--- a/plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb
+++ b/plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb
@@ -40,7 +40,7 @@ class MezuroPluginMyprofileController < ProfileController
def create_metric_configuration
id = params[:id]
metric_name = params[:metric_configuration][:metric][:name]
- Kalibro::MetricConfiguration.new(params[:metric_configuration]).save
+ (Kalibro::MetricConfiguration.new(params[:metric_configuration])).save
redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/edit_metric_configuration?id=#{id}&metric_name=#{metric_name.gsub(/\s/, '+')}"
end
@@ -66,6 +66,14 @@ class MezuroPluginMyprofileController < ProfileController
metric_configuration.update_attributes params[:metric_configuration]
redirect_to "/#{profile.identifier}/#{@configuration_content.slug}"
end
+
+ def remove_metric_configuration
+ configuration_content = profile.articles.find(params[:id])
+ metric_name = params[:metric_name]
+ metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(configuration_content.name, metric_name)
+ metric_configuration.destroy
+ redirect_to "/#{profile.identifier}/#{configuration_content.slug}"
+ end
def new_range
@configuration_content = profile.articles.find(params[:id])
@@ -104,9 +112,9 @@ class MezuroPluginMyprofileController < ProfileController
def remove_range
configuration_content = profile.articles.find(params[:id])
metric_name = params[:metric_name]
- beginning_id = params[:range_beginning]
+ beginning_id = params[:beginning_id]
metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(configuration_content.name, metric_name)
- metric_configuration.ranges.delete_if { |range| range.beginning == beginning_id.to_f }.inspect
+ metric_configuration.ranges.delete_if { |range| range.beginning == beginning_id.to_f }
metric_configuration.save
formatted_metric_name = metric_name.gsub(/\s/, '+')
if metric_configuration.metric.class == Kalibro::CompoundMetric
@@ -116,12 +124,4 @@ class MezuroPluginMyprofileController < ProfileController
end
end
- def remove_metric_configuration
- configuration_content = profile.articles.find(params[:id])
- metric_name = params[:metric_name]
- metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(configuration_content.name, metric_name)
- metric_configuration.destroy
- redirect_to "/#{profile.identifier}/#{configuration_content.slug}"
- end
-
end
diff --git a/plugins/mezuro/lib/kalibro/metric_configuration.rb b/plugins/mezuro/lib/kalibro/metric_configuration.rb
index 7b803bc..b2a6461 100644
--- a/plugins/mezuro/lib/kalibro/metric_configuration.rb
+++ b/plugins/mezuro/lib/kalibro/metric_configuration.rb
@@ -7,8 +7,8 @@ class Kalibro::MetricConfiguration < Kalibro::Model
def metric=(value)
if value.kind_of?(Hash)
- @metric = to_object(value, Kalibro::CompoundMetric) if value.has_key?(:script)
@metric = to_object(value, Kalibro::NativeMetric) if value.has_key?(:origin)
+ @metric = to_object(value, Kalibro::CompoundMetric) if value.has_key?(:script)
else
@metric = value
end
diff --git a/plugins/mezuro/test/fixtures/configuration_fixtures.rb b/plugins/mezuro/test/fixtures/configuration_fixtures.rb
index 7fa6feb..6ffb18b 100644
--- a/plugins/mezuro/test/fixtures/configuration_fixtures.rb
+++ b/plugins/mezuro/test/fixtures/configuration_fixtures.rb
@@ -8,7 +8,7 @@ class ConfigurationFixtures
def self.configuration_hash
{
- :name => 'Kalibro for Java',
+ :name => 'Sample Configuration',
:description => 'Kalibro configuration for Java projects.',
:metric_configuration => [
MetricConfigurationFixtures.amloc_metric_configuration_hash,
diff --git a/plugins/mezuro/test/functional/mezuro_plugin_myprofile_controller_test.rb b/plugins/mezuro/test/functional/mezuro_plugin_myprofile_controller_test.rb
index 690060f..e920d1c 100644
--- a/plugins/mezuro/test/functional/mezuro_plugin_myprofile_controller_test.rb
+++ b/plugins/mezuro/test/functional/mezuro_plugin_myprofile_controller_test.rb
@@ -5,6 +5,7 @@ require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/base_tool_fixtures"
require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/native_metric_fixtures"
require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/metric_configuration_fixtures"
require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/configuration_fixtures"
+require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/range_fixtures"
class MezuroPluginMyprofileControllerTest < ActionController::TestCase
@@ -15,178 +16,212 @@ class MezuroPluginMyprofileControllerTest < ActionController::TestCase
@profile = fast_create(Community)
@base_tool = BaseToolFixtures.base_tool
+ @base_tool_hash = BaseToolFixtures.base_tool_hash
@metric = NativeMetricFixtures.amloc
@metric_configuration = MetricConfigurationFixtures.amloc_metric_configuration
@metric_configuration_hash = MetricConfigurationFixtures.amloc_metric_configuration_hash
@compound_metric_configuration = MetricConfigurationFixtures.sc_metric_configuration
+ @compound_metric_configuration_hash = MetricConfigurationFixtures.sc_metric_configuration_hash
@configuration = ConfigurationFixtures.configuration
+ @configuration_hash = ConfigurationFixtures.configuration_hash
+
+ Kalibro::Configuration.expects(:all_names).returns([])
+ @content = MezuroPlugin::ConfigurationContent.new(:profile => @profile, :name => @configuration.name)
+ @content.expects(:send_configuration_to_service).returns(nil)
+ @content.save
+
+ @native_hash = @metric_configuration.to_hash.merge({:configuration_name => @metric_configuration.configuration_name})
+ @native_hash.delete :attributes!
+ @compound_hash = @compound_metric_configuration.to_hash.merge({:configuration_name => @compound_metric_configuration.configuration_name})
+ @compound_hash.delete :attributes!
+
+ @range = RangeFixtures.range_excellent
+ @range_hash = RangeFixtures.range_excellent_hash
end
- should 'test choose_base_tool' do
- create_configuration_content
- Kalibro::BaseTool.expects(:all_names).returns(@base_tool.name)
+ should 'test choose base tool' do
+ Kalibro::BaseTool.expects(:request).with("BaseTool", :get_base_tool_names).returns({:base_tool_name => @base_tool.name})
get :choose_base_tool, :profile => @profile.identifier, :id => @content.id
- assert_equal @base_tool.name, assigns(:base_tools)
+ assert_equal [@base_tool.name], assigns(:base_tools)
assert_equal @content, assigns(:configuration_content)
assert_response 200
end
- should 'test choose_metric' do
- create_configuration_content
- Kalibro::BaseTool.expects(:find_by_name).with(@base_tool.name).returns(@base_tool)
- @base_tool.expects(:supported_metrics).returns(@base_tool.supported_metric)
+ should 'test choose metric' do
+ Kalibro::BaseTool.expects(:request).with("BaseTool", :get_base_tool, {:base_tool_name => @base_tool.name}).returns({:base_tool => @base_tool_hash})
get :choose_metric, :profile => @profile.identifier, :id => @content.id, :base_tool => @base_tool.name
assert_equal @content, assigns(:configuration_content)
assert_equal @base_tool.name, assigns(:base_tool)
- assert_equal @base_tool.supported_metric, assigns(:supported_metrics)
+ assert_equal @base_tool.supported_metric[0].name, assigns(:supported_metrics)[0].name
assert_response 200
end
- should 'test new_metric_configuration' do
- create_configuration_content
- Kalibro::BaseTool.expects(:find_by_name).with(@base_tool.name).returns(@base_tool)
- @base_tool.expects(:metric).with(@metric.name).returns(@metric)
+ should 'test new metric configuration' do
+ Kalibro::BaseTool.expects(:request).with("BaseTool", :get_base_tool, {:base_tool_name => @base_tool.name}).returns({:base_tool => @base_tool_hash})
get :new_metric_configuration, :profile => @profile.identifier, :id => @content.id, :base_tool => @base_tool.name, :metric_name => @metric.name
assert_equal @content, assigns(:configuration_content)
- assert_equal @metric, assigns(:metric)
+ assert_equal @metric.name, assigns(:metric).name
assert_response 200
end
- should 'test new_compound_metric_configuration' do
- create_configuration_content
- Kalibro::Configuration.expects(:find_by_name).with(@content.name).returns(@configuration)
- @configuration.expects(:metric_configurations).returns(@configuration.metric_configuration)
+ should 'test new compound metric configuration' do
+ Kalibro::Configuration.expects(:request).with("Configuration", :get_configuration, {:configuration_name => @content.name}).returns({:configuration => @configuration_hash})
get :new_compound_metric_configuration, :profile => @profile.identifier, :id => @content.id
assert_equal @content, assigns(:configuration_content)
- assert_equal @configuration.metric_configuration, assigns(:metric_configurations)
+ assert_equal @configuration.metric_configuration[0].code, assigns(:metric_configurations)[0].code
assert_response 200
end
- should 'test edit_metric_configuration' do
- create_configuration_content
- Kalibro::MetricConfiguration.expects(:find_by_configuration_name_and_metric_name).with(@configuration.name, @metric.name).returns(@metric_configuration)
+ should 'test edit metric configuration' do
+ Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
+ :configuration_name => @content.name,
+ :metric_name => @metric_configuration.metric.name}).returns({:metric_configuration => @metric_configuration_hash})
get :edit_metric_configuration, :profile => @profile.identifier, :id => @content.id, :metric_name => @metric.name
assert_equal @content, assigns(:configuration_content)
- assert_equal @metric_configuration, assigns(:metric_configuration)
- assert_equal @metric_configuration.metric, assigns(:metric)
+ assert_equal @metric_configuration.code, assigns(:metric_configuration).code
+ assert_equal @metric_configuration.metric.name, assigns(:metric).name
assert_response 200
end
- should 'test edit_compound_metric_configuration' do
- create_configuration_content
- Kalibro::MetricConfiguration.expects(:find_by_configuration_name_and_metric_name).with(@configuration.name, @metric.name).returns(@compound_metric_configuration)
- Kalibro::Configuration.expects(:find_by_name).with(@content.name).returns(@configuration)
- @configuration.expects(:metric_configurations).returns(@configuration.metric_configuration)
- get :edit_compound_metric_configuration, :profile => @profile.identifier, :id => @content.id, :metric_name => @metric.name
+ should 'test edit compound metric configuration' do
+ Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
+ :configuration_name => @content.name,
+ :metric_name => @compound_metric_configuration.metric.name}).returns({:metric_configuration => @compound_metric_configuration_hash})
+ Kalibro::Configuration.expects(:request).with("Configuration", :get_configuration, {:configuration_name => @content.name}).returns({:configuration => @configuration_hash})
+ get :edit_compound_metric_configuration,
+ :profile => @profile.identifier,
+ :id => @content.id,
+ :metric_name => @compound_metric_configuration.metric.name
assert_equal @content, assigns(:configuration_content)
- assert_equal @compound_metric_configuration, assigns(:metric_configuration)
- assert_equal @compound_metric_configuration.metric, assigns(:metric)
- assert_equal @configuration.metric_configuration, assigns(:metric_configurations)
+ assert_equal @compound_metric_configuration.code, assigns(:metric_configuration).code
+ assert_equal @compound_metric_configuration.metric.name, assigns(:metric).name
+ assert_equal @configuration.metric_configuration[0].code, assigns(:metric_configurations)[0].code
assert_response 200
end
- should 'test create_metric_configuration' do
- create_configuration_content
- @metric_configuration.expects(:save).returns(true)
- MezuroPlugin::ConfigurationContent.expects(:validate_kalibro_configuration_name).returns(true)
- MezuroPlugin::ConfigurationContent.expects(:send_configuration_to_service).returns(true)
- get :create_metric_configuration, :profile => @profile.identifier, :id => @content.id, :metric_configuration => @metric_configuration_hash
+ should 'test create native metric configuration' do
+ Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :save_metric_configuration, {
+ :metric_configuration => @metric_configuration.to_hash,
+ :configuration_name => @metric_configuration.configuration_name})
+ get :create_metric_configuration,
+ :profile => @profile.identifier,
+ :id => @content.id,
+ :metric_configuration => @native_hash
assert_response 302
end
-=begin
should 'test compound metric creation' do
- create_configuration_content
- Kalibro::MetricConfiguration.expects(:new).returns(@metric_configuration_client)
- @metric_configuration_client.expects(:save)
+ Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :save_metric_configuration, {
+ :metric_configuration => @compound_metric_configuration.to_hash,
+ :configuration_name => @compound_metric_configuration.configuration_name})
get :create_compound_metric_configuration, :profile => @profile.identifier, :id => @content.id,
- :metric_configuration => { :code => @compound_metric_configuration.code, :weight => @compound_metric_configuration.weight,
- :aggregation_form => @compound_metric_configuration.aggregation_form, :metric => { :name => @compound_metric_configuration.metric.name ,
- :description => @compound_metric_configuration.metric.description, :scope => @compound_metric_configuration.metric.scope,
- :script => @compound_metric_configuration.metric.script}}
+ :metric_configuration => @compound_hash
assert_response 302
end
- should 'test metric edition' do
- create_configuration_content
- Kalibro::MetricConfiguration.expects(:new).returns(@metric_configuration_client)
- @metric_configuration_client.expects(:metric_configuration).with(@configuration.name,@metric.name).returns(@metric_configuration)
- get :edit_metric_configuration, :profile => @profile.identifier, :id => @content.id, :metric_name => @metric.name
- assert_response 200
- end
-
- should 'test compound metric edition' do
- create_configuration_content
- configuration_client = mock
- Kalibro::MetricConfiguration.expects(:new).returns(@metric_configuration_client)
- Kalibro::Configuration.expects(:new).returns(configuration_client)
- configuration_client.expects(:configuration).with(@configuration.name).returns(@configuration)
- @metric_configuration_client.expects(:metric_configuration).with(@configuration.name,@metric.name).returns(@compound_metric_configuration)
- get :edit_compound_metric_configuration, :profile => @profile.identifier, :id => @content.id, :metric_name => @metric.name
- assert_response 200
- end
-
- should 'update metric configuration' do
- create_configuration_content
- Kalibro::MetricConfiguration.expects(:new).returns(@metric_configuration_client)
- Kalibro::MetricConfiguration.expects(:new).returns(@metric_configuration_client)
- @metric_configuration_client.expects(:metric_configuration).with(@configuration.name, @metric_configuration.metric.name).returns(@metric_configuration)
- @metric_configuration_client.expects(:save)
+ should 'test update native metric configuration' do
+ Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
+ :configuration_name => @content.name,
+ :metric_name => @metric_configuration.metric.name}).returns({:metric_configuration => @metric_configuration_hash})
+ Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :save_metric_configuration, {
+ :metric_configuration => @metric_configuration.to_hash,
+ :configuration_name => @metric_configuration.configuration_name})
get :update_metric_configuration, :profile => @profile.identifier, :id => @content.id,
- :metric_configuration => { :code => @metric_configuration.code, :weight => @metric_configuration.weight, :aggregation => @metric_configuration.aggregation_form,
- :metric => { :name => @metric.name, :origin => @metric.origin, :description => @metric.description, :scope => @metric.scope, :language => @metric.language }}
+ :metric_configuration => @native_hash
+ assert_equal @content, assigns(:configuration_content)
assert_response 302
end
- should 'update compound metric configuration' do
- create_configuration_content
- Kalibro::MetricConfiguration.expects(:new).returns(@metric_configuration_client)
- Kalibro::MetricConfiguration.expects(:new).returns(@metric_configuration_client)
- @metric_configuration_client.expects(:metric_configuration).with(@configuration.name, @compound_metric_configuration.metric.name).returns(@compound_metric_configuration)
- @metric_configuration_client.expects(:save)
+ should 'test update compound metric configuration' do
+ Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
+ :configuration_name => @content.name,
+ :metric_name => @compound_metric_configuration.metric.name}).returns({:metric_configuration => @compound_metric_configuration_hash})
+ Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :save_metric_configuration, {
+ :metric_configuration => @compound_metric_configuration.to_hash,
+ :configuration_name => @compound_metric_configuration.configuration_name})
get :update_compound_metric_configuration, :profile => @profile.identifier, :id => @content.id,
- :metric_configuration => { :code => @compound_metric_configuration.code, :weight => @compound_metric_configuration.weight,
- :aggregation_form => @compound_metric_configuration.aggregation_form, :metric => { :name => @compound_metric_configuration.metric.name ,
- :description => @compound_metric_configuration.metric.description, :scope => @compound_metric_configuration.metric.scope,
- :script => @compound_metric_configuration.metric.script}}
+ :metric_configuration => @compound_hash
+ assert_equal @content, assigns(:configuration_content)
assert_response 302
end
- should 'assign configuration name and metric name to new range' do
- create_configuration_content
- get :new_range, :profile => @profile.identifier, :id => @content.id, :metric_name => @metric.name
- assert_equal assigns(:configuration_content), @content
- assert_equal assigns(:metric_name), @metric.name
- end
-
- should 'create instance range' do
- create_configuration_content
- Kalibro::MetricConfiguration.expects(:new).returns(@metric_configuration_client)
- Kalibro::MetricConfiguration.expects(:new).returns(@metric_configuration_client)
- @metric_configuration_client.expects(:metric_configuration).with(@configuration.name, @metric.name).returns(@metric_configuration)
- @metric_configuration_client.expects(:save)
- range = @metric_configuration.ranges[0]
- get :create_range, :profile => @profile.identifier, :range => { :beginning => range.beginning, :end => range.end, :label => range.label,
- :grade => range.grade, :color => range.color, :comments => range.comments }, :id => @content.id, :metric_name => @metric.name
- assert assigns(:range).instance_of?(Kalibro::Range)
- end
-
- should 'redirect from remove metric configuration' do
- create_configuration_content
- Kalibro::MetricConfiguration.expects(:new).returns(@metric_configuration_client)
- @metric_configuration_client.expects(:remove)
+ should 'test remove metric configuration' do
+ Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
+ :configuration_name => @content.name,
+ :metric_name => @metric.name}).returns({:metric_configuration => @metric_configuration_hash})
+ Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :remove_metric_configuration, {
+ :metric_name => @metric.name,
+ :configuration_name => @metric_configuration.configuration_name})
get :remove_metric_configuration, :profile => @profile.identifier, :id => @content.id, :metric_name => @metric.name
assert_response 302
end
-
- private
-=end
-
- def create_configuration_content
- Kalibro::Configuration.expects(:all_names).returns([])
- @content = MezuroPlugin::ConfigurationContent.new(:profile => @profile, :name => @configuration.name)
- @content.expects(:send_configuration_to_service).returns(nil)
- @content.save
+
+ should 'test new range' do
+ get :new_range, :profile => @profile.identifier, :id => @content.id, :metric_name => @metric.name
+ assert_equal @content, assigns(:configuration_content)
+ assert_equal @metric.name, assigns(:metric_name)
+ assert_response 200
+ end
+
+ should 'test edit range' do
+ Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
+ :configuration_name => @content.name,
+ :metric_name => @metric.name}).returns({:metric_configuration => @metric_configuration_hash})
+ get :edit_range, :profile => @profile.identifier, :id => @content.id, :metric_name => @metric.name, :beginning_id => @range.beginning
+ assert_equal @content, assigns(:configuration_content)
+ assert_equal @metric.name, assigns(:metric_name)
+ assert_equal @range.beginning, assigns(:beginning_id)
+ assert_equal @range.end, assigns(:range).end
+ assert_response 200
end
+
+ should 'test create instance range' do
+ metric_configuration = @metric_configuration
+ metric_configuration.add_range(@range)
+ Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
+ :configuration_name => @content.name,
+ :metric_name => @metric.name}).returns({:metric_configuration => @metric_configuration_hash})
+ Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :save_metric_configuration, {
+ :metric_configuration => metric_configuration.to_hash,
+ :configuration_name => metric_configuration.configuration_name})
+ get :create_range, :profile => @profile.identifier, :range => @range_hash, :id => @content.id, :metric_name => @metric.name
+ assert_equal @content, assigns(:configuration_content)
+ assert_equal @range.end, assigns(:range).end
+ assert_response 200
+ end
+
+ should 'test update range' do
+ Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
+ :configuration_name => @content.name,
+ :metric_name => @metric.name}).returns({:metric_configuration => @metric_configuration_hash})
+ Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :save_metric_configuration, {
+ :metric_configuration => @metric_configuration.to_hash,
+ :configuration_name => @metric_configuration.configuration_name})
+ get :update_range,
+ :profile => @profile.identifier,
+ :range => @range_hash,
+ :id => @content.id,
+ :metric_name => @metric.name,
+ :beginning_id => @range.beginning
+ assert_response 200
+ end
+
+ should 'test remove range' do
+ metric_configuration = @metric_configuration
+ metric_configuration.ranges.delete_if { |range| range.beginning == @range.beginning.to_f }
+ Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
+ :configuration_name => @content.name,
+ :metric_name => @metric.name}).returns({:metric_configuration => @metric_configuration_hash})
+ Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :save_metric_configuration, {
+ :metric_configuration => metric_configuration.to_hash,
+ :configuration_name => metric_configuration.configuration_name})
+ get :remove_range,
+ :profile => @profile.identifier,
+ :id => @content.id,
+ :metric_name => @metric.name,
+ :beginning_id => @range.beginning
+ assert_response 302
+ end
+
end
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/_range.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/_range.html.erb
index fc5db85..27fd6f1 100644
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/_range.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_myprofile/_range.html.erb
@@ -13,5 +13,5 @@
|
<%= link_to_remote "Edit", :url => {:action =>"edit_range", :controller => "mezuro_plugin_myprofile", :id => params[:id], :metric_name => params[:metric_name], :beginning_id => range.beginning} %> |
- <%= link_to "Remove", :action =>"remove_range", :controller => "mezuro_plugin_myprofile", :id => params[:id], :metric_name => params[:metric_name], :range_beginning => range.beginning %> |
+ <%= link_to "Remove", :action =>"remove_range", :controller => "mezuro_plugin_myprofile", :id => params[:id], :metric_name => params[:metric_name], :beginning_id => range.beginning %> |
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb
index a6b7c67..818a2d8 100644
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb
@@ -1,6 +1,6 @@
-<%= @configuration_content.name %>Configuration
+<%= @configuration_content.name %> Configuration
<% form_for :metric_configuration, :url => {:action =>"create_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
<%= hidden_field_tag :id, @configuration_content.id %>
@@ -19,7 +19,7 @@
<%= m.hidden_field "origin", :value => @metric.origin %>
- <%= m.label :metric_name, "Metric Name:" %>
+ <%= m.label :name, "Metric Name:" %>
<%= @metric.name %>
<%= m.hidden_field "name", :value => @metric.name %>
--
libgit2 0.21.2