diff --git a/plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb b/plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb
index d8f587d..2f6e983 100644
--- a/plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb
+++ b/plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb
@@ -14,7 +14,6 @@ class MezuroPluginRangeController < MezuroPluginMyprofileController
ranges = Kalibro::Range.ranges_of params[:metric_configuration_id].to_i
@range = (ranges.select { |range| range.id == params[:range_id].to_i }).first
@reading_labels_and_ids = reading_labels_and_ids
- @selected_reading_label = @range.label
end
def create
diff --git a/plugins/mezuro/lib/kalibro/range.rb b/plugins/mezuro/lib/kalibro/range.rb
index 6d5fdaf..eb5860c 100644
--- a/plugins/mezuro/lib/kalibro/range.rb
+++ b/plugins/mezuro/lib/kalibro/range.rb
@@ -34,6 +34,10 @@ class Kalibro::Range < Kalibro::Model
end
end
+ def reading_id=(value)
+ @reading_id = value.to_i
+ end
+
def label
reading.label
end
diff --git a/plugins/mezuro/test/functional/myprofile/mezuro_plugin_range_controller_test.rb b/plugins/mezuro/test/functional/myprofile/mezuro_plugin_range_controller_test.rb
index 914c428..9da7fb8 100644
--- a/plugins/mezuro/test/functional/myprofile/mezuro_plugin_range_controller_test.rb
+++ b/plugins/mezuro/test/functional/myprofile/mezuro_plugin_range_controller_test.rb
@@ -57,7 +57,7 @@ class MezuroPluginRangeControllerTest < ActionController::TestCase
:metric_configuration_id => @metric_configuration.id,
:range => @created_range.to_hash}).returns(:range_id => @range.id)
Kalibro::Reading.expects(:find).with(@created_range.reading_id).returns(@reading)
- get :create, :range => @created_range_hash, :metric_configuration_id => @metric_configuration.id
+ get :create, :profile => @profile.identifier, :range => @created_range_hash, :metric_configuration_id => @metric_configuration.id
assert_equal @range.id, assigns(:range).id
assert_response 200
end
@@ -66,8 +66,7 @@ class MezuroPluginRangeControllerTest < ActionController::TestCase
Kalibro::Range.expects(:request).with(:save_range, {
:metric_configuration_id => @metric_configuration.id,
:range => @range.to_hash}).returns(:range_id => @range.id)
- Kalibro::Reading.expects(:find).with(@range.reading_id).returns(@reading)
- get :update, :range => @range_hash, :metric_configuration_id => @metric_configuration.id
+ get :update, :profile => @profile.identifier, :range => @range_hash, :metric_configuration_id => @metric_configuration.id
assert_equal @range.id, assigns(:range).id
assert_response 200
end
@@ -75,7 +74,7 @@ class MezuroPluginRangeControllerTest < ActionController::TestCase
should 'test remove range in native metric configuration' do
Kalibro::Range.expects(:new).with({:id => @range.id}).returns(@range)
@range.expects(:destroy).with().returns()
- get :remove, :id => @content.id, :metric_configuration_id => @metric_configuration.id, :range_id => @range.id, :compound => false
+ get :remove, :profile => @profile.identifier, :id => @content.id, :metric_configuration_id => @metric_configuration.id, :range_id => @range.id, :compound => false
assert_response 302
end
end
diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound.html.erb
index 7c135e5..ee590a6 100644
--- a/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound.html.erb
+++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound.html.erb
@@ -50,20 +50,14 @@
Color
- <%
- #if (@metric_configuration.ranges!=nil)
- # @metric_configuration.ranges.each do |range|
- %>
- <%= #render :partial => "mezuro_plugin_range/range", :locals => {:range => range, :id => @configuration_content.id,
- #:metric_name => @metric_configuration.metric.name}
- %>
- <% #end
- #end
- %>
+ <% @ranges.each do |range| %>
+ <%= render :partial => "mezuro_plugin_range/range", :locals => {:range => range, :id => @configuration_content.id,
+ :metric_configuration_id => @metric_configuration.id, :reading_group_id => @metric_configuration.reading_group_id, :compound => @metric_configuration.metric.compound} %>
+ <% end %>
-<%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_range", :id => @configuration_content.id, :metric_name => @metric.name} %>
-
-- libgit2 0.21.2 |