Download as
Browse Code »

Commit dbae4eee91c4a5bdc46eee8707607887a216ae45

Authored by Alessandro Palmeira + Guilherme Rojas
Committed by Paulo Meireles
1 parent e8569682
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

[Mezuro] Added validation to reading

Showing 4 changed files with 19 additions and 4 deletions   Show diff stats
plugins/mezuro/public/javascripts/validations.js
  Diff comments   View file @dbae4ee
@@ -2,6 +2,7 @@ jQuery(function (){ @@ -2,6 +2,7 @@ jQuery(function (){
2 jQuery('#range_submit').live("click", validate_new_range_configuration); 2 jQuery('#range_submit').live("click", validate_new_range_configuration);
3 jQuery('#metric_configuration_submit').live("click", validate_metric_configuration); 3 jQuery('#metric_configuration_submit').live("click", validate_metric_configuration);
4 jQuery('#repository_submit').live("click", validate_new_repository); 4 jQuery('#repository_submit').live("click", validate_new_repository);
  5 + jQuery('#reading_submit').live("click", validate_new_reading);
5 }); 6 });
6 7
7 function validate_code(code){ 8 function validate_code(code){
@@ -19,6 +20,17 @@ function allRequiredFieldsAreFilled() { @@ -19,6 +20,17 @@ function allRequiredFieldsAreFilled() {
19 return true; 20 return true;
20 } 21 }
21 22
  23 +function validate_new_reading() {
  24 + var name = jQuery('#reading_label').val();
  25 + var grade = jQuery('#reading_grade').val();
  26 + var color = jQuery('#reading_color').val();
  27 + if (is_null(name) || is_null(grade) || is_null(color)){
  28 + alert("Please fill all fields marked with (*).");
  29 + return false;
  30 + }
  31 + return true;
  32 +}
  33 +
22 function validate_new_repository() { 34 function validate_new_repository() {
23 if (allRequiredFieldsAreFilled()) { 35 if (allRequiredFieldsAreFilled()) {
24 return addressAndTypeMatch(); 36 return addressAndTypeMatch();
plugins/mezuro/views/mezuro_plugin_reading/_form.html.erb
  Diff comments   View file @dbae4ee
1 <%= hidden_field_tag :id, @reading_group_content.id %> 1 <%= hidden_field_tag :id, @reading_group_content.id %>
2 2
3 -<%= required labelled_form_field _('label:'), f.text_field(:label) %> 3 +<%= required labelled_form_field _('Label:'), f.text_field(:label) %>
4 4
5 -<%= required labelled_form_field _('grade:'),  
6 -f.text_field(:grade) %> 5 +<%= required labelled_form_field _('Grade:'), f.text_field(:grade) %>
7 6
8 -<%= required labelled_form_field _('color:'), 7 +<%= required labelled_form_field _('Color:'),
9 colorpicker_field(:reading, :color) %>Click in the field to change Color 8 colorpicker_field(:reading, :color) %>Click in the field to change Color
10 9
11 <p><%= f.submit "Save" %></p> 10 <p><%= f.submit "Save" %></p>
plugins/mezuro/views/mezuro_plugin_reading/edit.html.erb
  Diff comments   View file @dbae4ee
1 <script src="/javascripts/colorpicker.js" type="text/javascript"></script> 1 <script src="/javascripts/colorpicker.js" type="text/javascript"></script>
2 <script src="/javascripts/colorpicker-noosfero.js" type="text/javascript"></script> 2 <script src="/javascripts/colorpicker-noosfero.js" type="text/javascript"></script>
  3 +<script src="/plugins/mezuro/javascripts/validations.js" type="text/javascript"></script>
  4 +
3 <h2><%= link_to("#{@reading_group_content.name} Reading Group", @reading_group_content.view_url) %></h2> 5 <h2><%= link_to("#{@reading_group_content.name} Reading Group", @reading_group_content.view_url) %></h2>
4 6
5 <% form_for :reading, :url => {:action =>"save", :controller => "mezuro_plugin_reading"}, :method => :get do |f| %> 7 <% form_for :reading, :url => {:action =>"save", :controller => "mezuro_plugin_reading"}, :method => :get do |f| %>
plugins/mezuro/views/mezuro_plugin_reading/new.html.erb
  Diff comments   View file @dbae4ee
1 <script src="/javascripts/colorpicker.js" type="text/javascript"></script> 1 <script src="/javascripts/colorpicker.js" type="text/javascript"></script>
2 <script src="/javascripts/colorpicker-noosfero.js" type="text/javascript"></script> 2 <script src="/javascripts/colorpicker-noosfero.js" type="text/javascript"></script>
  3 +<script src="/plugins/mezuro/javascripts/validations.js" type="text/javascript"></script>
  4 +
3 <h2><%= link_to("#{@reading_group_content.name} Reading Group", @reading_group_content.view_url) %></h2> 5 <h2><%= link_to("#{@reading_group_content.name} Reading Group", @reading_group_content.view_url) %></h2>
4 6
5 <% form_for :reading, :url => {:action =>"save", :controller => "mezuro_plugin_reading"}, :method => :get do |f| %> 7 <% form_for :reading, :url => {:action =>"save", :controller => "mezuro_plugin_reading"}, :method => :get do |f| %>