From d3cf2f059ff820adbb5bb45bc7051d2f7fdbf854 Mon Sep 17 00:00:00 2001 From: João M. M. da Silva + Alessandro Palmeira + Diego Araújo Date: Tue, 2 Oct 2012 16:27:46 -0300 Subject: [PATCH] [Mezuro] refactored and fixed range views and javascript. --- plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb | 9 +++++---- plugins/mezuro/public/javascripts/validations.js | 2 +- plugins/mezuro/test/functional/myprofile/mezuro_plugin_range_controller_test.rb | 4 ++-- plugins/mezuro/views/mezuro_plugin_range/_edit_range.html.erb | 4 ++-- plugins/mezuro/views/mezuro_plugin_range/_new_range.html.erb | 2 +- plugins/mezuro/views/mezuro_plugin_range/_range_form.html.erb | 9 +++++---- plugins/mezuro/views/mezuro_plugin_range/create_range.rjs | 1 - plugins/mezuro/views/mezuro_plugin_range/edit_range.rjs | 2 +- plugins/mezuro/views/mezuro_plugin_range/new_range.rjs | 2 +- 9 files changed, 18 insertions(+), 17 deletions(-) diff --git a/plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb b/plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb index 7d68d8a..0d679f7 100644 --- a/plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb +++ b/plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb @@ -3,17 +3,18 @@ class MezuroPluginRangeController < MezuroPluginMyprofileController append_view_path File.join(File.dirname(__FILE__) + '/../../views') def new_range - @configuration_content = profile.articles.find(params[:id]) + @content_id = params[:id] @metric_name = params[:metric_name] @range = Kalibro::Range.new @range_color = "#000000" end def edit_range - @configuration_content = profile.articles.find(params[:id]) - @metric_name = params[:metric_name] @beginning_id = params[:beginning_id] - metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, @metric_name) + @content_id = params[:id] + configuration_name = profile.articles.find(@content_id).name + @metric_name = params[:metric_name] + metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(configuration_name, @metric_name) @range = metric_configuration.ranges.find{|range| range.beginning == @beginning_id.to_f || @beginning_id =="-INF" } @range_color = "#" + @range.color.to_s.gsub(/^ff/, "") end diff --git a/plugins/mezuro/public/javascripts/validations.js b/plugins/mezuro/public/javascripts/validations.js index df80021..d73165e 100644 --- a/plugins/mezuro/public/javascripts/validations.js +++ b/plugins/mezuro/public/javascripts/validations.js @@ -45,7 +45,7 @@ function validate_new_range_configuration(event){ var end = jQuery("#range_end").val(); var color = jQuery("#range_color").val(); var grade = jQuery("#range_grade").val(); - + if (is_null(label) || is_null(beginning) || is_null(end) || is_null(color) || is_null(grade)) { alert("Please fill all fields marked with (*)."); 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 5bed6d0..88c287d 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 @@ -30,7 +30,7 @@ class MezuroPluginRangeControllerTest < ActionController::TestCase 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 @content.id.to_s, assigns(:content_id) assert_equal @metric.name, assigns(:metric_name) assert_response 200 end @@ -40,7 +40,7 @@ class MezuroPluginRangeControllerTest < ActionController::TestCase :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 @content.id.to_s, assigns(:content_id) assert_equal @metric.name, assigns(:metric_name) assert_equal @range.beginning, assigns(:beginning_id) assert_equal @range.end, assigns(:range).end diff --git a/plugins/mezuro/views/mezuro_plugin_range/_edit_range.html.erb b/plugins/mezuro/views/mezuro_plugin_range/_edit_range.html.erb index 92b9a94..80221d8 100644 --- a/plugins/mezuro/views/mezuro_plugin_range/_edit_range.html.erb +++ b/plugins/mezuro/views/mezuro_plugin_range/_edit_range.html.erb @@ -1,4 +1,4 @@ <% remote_form_for :range, :url => {:action =>"update_range", :controller => "mezuro_plugin_range"}, :method => :get do |f| %> - <%= hidden_field_tag :beginning_id, beginning_id %> - <%= render :partial => "range_form", :locals => {:f => f, :metric_name => metric_name, :id => id, :beginning_id => beginning_id, :range => range } %> + <%= hidden_field_tag :beginning_id, @beginning_id %> + <%= render :partial => "range_form", :locals => {:f => f} %> <% end %> diff --git a/plugins/mezuro/views/mezuro_plugin_range/_new_range.html.erb b/plugins/mezuro/views/mezuro_plugin_range/_new_range.html.erb index 245a782..2c3d554 100644 --- a/plugins/mezuro/views/mezuro_plugin_range/_new_range.html.erb +++ b/plugins/mezuro/views/mezuro_plugin_range/_new_range.html.erb @@ -1,3 +1,3 @@ <% remote_form_for :range, :url => {:action =>"create_range", :controller => "mezuro_plugin_range"}, :method => :get do |f| %> - <%= render :partial => "range_form", :locals => {:f => f, :metric_name => metric_name, :id => id } %> + <%= render :partial => "range_form", :locals => {:f => f} %> <% end %> diff --git a/plugins/mezuro/views/mezuro_plugin_range/_range_form.html.erb b/plugins/mezuro/views/mezuro_plugin_range/_range_form.html.erb index f17d7f1..452ccf8 100644 --- a/plugins/mezuro/views/mezuro_plugin_range/_range_form.html.erb +++ b/plugins/mezuro/views/mezuro_plugin_range/_range_form.html.erb @@ -1,5 +1,6 @@ -<%= hidden_field_tag :id, id %> -<%= hidden_field_tag :metric_name, metric_name %> +<%= hidden_field_tag :id, @content_id %> +<%= hidden_field_tag :metric_name, @metric_name %> + @@ -22,7 +23,7 @@ <%= f.label :end, "(*) End:" %> diff --git a/plugins/mezuro/views/mezuro_plugin_range/create_range.rjs b/plugins/mezuro/views/mezuro_plugin_range/create_range.rjs index de71f74..f0cf9ee 100644 --- a/plugins/mezuro/views/mezuro_plugin_range/create_range.rjs +++ b/plugins/mezuro/views/mezuro_plugin_range/create_range.rjs @@ -1,3 +1,2 @@ -page.alert @message page.visual_effect :toggle_slide, "range_form" page.insert_html :bottom, "ranges", :partial => "range", :locals => {:range => @range} diff --git a/plugins/mezuro/views/mezuro_plugin_range/edit_range.rjs b/plugins/mezuro/views/mezuro_plugin_range/edit_range.rjs index 1bfba97..5ab796e 100644 --- a/plugins/mezuro/views/mezuro_plugin_range/edit_range.rjs +++ b/plugins/mezuro/views/mezuro_plugin_range/edit_range.rjs @@ -1,3 +1,3 @@ -page.replace_html 'range_form', :partial => "edit_range", :locals => {:metric_name => @metric_name, :id => @configuration_content.id, :beginning_id => @beginning_id, :range => @range } +page.replace_html 'range_form', :partial => "edit_range", :locals => {:range => @range} page.visual_effect :slide_down, "range_form" diff --git a/plugins/mezuro/views/mezuro_plugin_range/new_range.rjs b/plugins/mezuro/views/mezuro_plugin_range/new_range.rjs index dbfaddf..2304740 100644 --- a/plugins/mezuro/views/mezuro_plugin_range/new_range.rjs +++ b/plugins/mezuro/views/mezuro_plugin_range/new_range.rjs @@ -1,3 +1,3 @@ -page.replace_html 'range_form', :partial => "new_range", :locals => {:metric_name => @metric_name, :id => @configuration_content.id } +page.replace_html 'range_form', :partial => "new_range" page.visual_effect :slide_down, "range_form" -- libgit2 0.21.2
@@ -14,7 +15,7 @@ <%= f.label :beginning, "(*) Beginning:" %> - <%= f.text_field :beginning, :value => @range.beginning , :id => 'beginning' %> <%= link_to('-∞', 'javascript:void(0)', :onClick => "jQuery( '#beginning' ).val('-INF');") %> + <%= f.text_field :beginning, :id => "range_beginning" %> <%= link_to('-∞', 'javascript:void(0)', :onClick => "jQuery( '#range_beginning' ).val('-INF');") %>
- <%= f.text_field :end, :value => @range.end, :id => "end" %> <%= link_to('+∞', 'javascript:void(0)', :onClick => "jQuery( '#end' ).val('+INF');") %> + <%= f.text_field(:end, :id => "range_end") %> <%= link_to('+∞', 'javascript:void(0)', :onClick => "jQuery( '#range_end' ).val('+INF');") %>