diff --git a/plugins/mezuro/public/javascripts/validations.js b/plugins/mezuro/public/javascripts/validations.js index 697cc9b..60cae3d 100644 --- a/plugins/mezuro/public/javascripts/validations.js +++ b/plugins/mezuro/public/javascripts/validations.js @@ -1,10 +1,18 @@ +jQuery(function (){ + jQuery('#range_submit').live("click", validate_new_range_configuration); + jQuery('#metric_configuration_submit').live("click", validate_metric_configuration); +}); + + + function validate_metric_configuration(){ - var code=document.forms["configuration_form"]["metric_configuration[code]"].value; + var code = jQuery('#metric_configuration_code').val(); if (is_null(code)) { alert("Code must be filled out"); return false; } + return true; } function is_null(value){ @@ -30,14 +38,12 @@ function IsNotHexadecimal(value){ return true; } -function validate_new_range_configuration(){ - var label = document.forms["new_range_form"]["range[label]"].value; - var beginning = document.forms["new_range_form"]["range[beginning]"].value; - var end = document.forms["new_range_form"]["range[end]"].value; - var color = document.forms["new_range_form"]["range[color]"].value; - var grade = document.forms["new_range_form"]["range[grade]"].value; - - return false; +function validate_new_range_configuration(event){ + var label = jQuery("#range_label").val(); + var beginning = jQuery("#range_beginning").val(); + 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)) { diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/_edit_range.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/_edit_range.html.erb index aa15fde..494ed66 100644 --- a/plugins/mezuro/views/mezuro_plugin_myprofile/_edit_range.html.erb +++ b/plugins/mezuro/views/mezuro_plugin_myprofile/_edit_range.html.erb @@ -1,4 +1,4 @@ -<% remote_form_for :range, :url => {:action =>"update_range", :controller => "mezuro_plugin_myprofile"}, :method => :get, :html => { :name => "new_range_form", :onSubmit => 'return validate_new_range_configuration()'} do |f| %> +<% remote_form_for :range, :url => {:action =>"update_range", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %> <%= hidden_field_tag :beginning_id, beginning_id %> <%= render :partial => "range_form", :locals => {:f => f, :metric_name => metric_name, :configuration_name => configuration_name, :beginning_id => beginning_id, :range => range } %> <% end %> diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/_new_range.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/_new_range.html.erb index 3518c1b..471aaea 100644 --- a/plugins/mezuro/views/mezuro_plugin_myprofile/_new_range.html.erb +++ b/plugins/mezuro/views/mezuro_plugin_myprofile/_new_range.html.erb @@ -1,3 +1,3 @@ -<% remote_form_for :range, :url => {:action =>"create_range", :controller => "mezuro_plugin_myprofile"}, :method => :get, :html => { :name => "new_range_form", :onSubmit => 'return validate_new_range_configuration()'} do |f| %> +<% remote_form_for :range, :url => {:action =>"create_range", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %> <%= render :partial => "range_form", :locals => {:f => f, :metric_name => metric_name, :configuration_name => configuration_name } %> <% end %> 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 b30f692..5aa81a9 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 @@ -3,7 +3,7 @@