Download as
Browse Code »

Commit a4d55f5c48b990e09ea425e87b18e9954a2f4049

Authored by Antonio Terceiro
1 parent 7e84ddcd
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Fix field checkboxes 

The hidden fields must come before the check boxes
Showing 3 changed files with 9 additions and 9 deletions   Show diff stats
app/views/features/_manage_community_fields.rhtml
  Diff comments   View file @a4d55f5
@@ -14,16 +14,16 @@ @@ -14,16 +14,16 @@
14 <td><label for="community_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td> 14 <td><label for="community_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td>
15 15
16 <td> 16 <td>
17 - <%= check_box_tag "community_fields[#{field}][active]", true, environment.custom_community_field(field, 'active'), :onclick => "$('community_fields[#{field}][required]').disabled=$('community_fields[#{field}][signup]').disabled=!this.checked;" %>  
18 <%= hidden_field_tag "community_fields[#{field}][active]", false %> 17 <%= hidden_field_tag "community_fields[#{field}][active]", false %>
  18 + <%= check_box_tag "community_fields[#{field}][active]", true, environment.custom_community_field(field, 'active'), :onclick => "$('community_fields[#{field}][required]').disabled=$('community_fields[#{field}][signup]').disabled=!this.checked;" %>
19 </td> 19 </td>
20 <td> 20 <td>
21 - <%= check_box_tag "community_fields[#{field}][required]", true, environment.custom_community_field(field, 'required'), :onclick => "if(this.checked) $('community_fields[#{field}][signup]').checked = true;" %>  
22 <%= hidden_field_tag "community_fields[#{field}][required]", false %> 21 <%= hidden_field_tag "community_fields[#{field}][required]", false %>
  22 + <%= check_box_tag "community_fields[#{field}][required]", true, environment.custom_community_field(field, 'required'), :onclick => "if(this.checked) $('community_fields[#{field}][signup]').checked = true;" %>
23 </td> 23 </td>
24 <td> 24 <td>
25 - <%= check_box_tag "community_fields[#{field}][signup]", true, environment.custom_community_field(field, 'signup'), :onclick => "if(!this.checked) $('community_fields[#{field}][required]').checked = false;" %>  
26 <%= hidden_field_tag "community_fields[#{field}][signup]", false %> 25 <%= hidden_field_tag "community_fields[#{field}][signup]", false %>
  26 + <%= check_box_tag "community_fields[#{field}][signup]", true, environment.custom_community_field(field, 'signup'), :onclick => "if(!this.checked) $('community_fields[#{field}][required]').checked = false;" %>
27 </td> 27 </td>
28 28
29 </tr> 29 </tr>
app/views/features/_manage_enterprise_fields.rhtml
  Diff comments   View file @a4d55f5
@@ -14,16 +14,16 @@ @@ -14,16 +14,16 @@
14 14
15 <td><label for="enterprise_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td> 15 <td><label for="enterprise_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td>
16 <td> 16 <td>
17 - <%= check_box_tag "enterprise_fields[#{field}][active]", true, environment.custom_enterprise_field(field, 'active'), :onclick => "$('enterprise_fields[#{field}][required]').disabled=$('enterprise_fields[#{field}][signup]').disabled=!this.checked;" %>  
18 <%= hidden_field_tag "enterprise_fields[#{field}][active]", false %> 17 <%= hidden_field_tag "enterprise_fields[#{field}][active]", false %>
  18 + <%= check_box_tag "enterprise_fields[#{field}][active]", true, environment.custom_enterprise_field(field, 'active'), :onclick => "$('enterprise_fields[#{field}][required]').disabled=$('enterprise_fields[#{field}][signup]').disabled=!this.checked;" %>
19 </td> 19 </td>
20 <td> 20 <td>
21 - <%= check_box_tag "enterprise_fields[#{field}][required]", true, environment.custom_enterprise_field(field, 'required'), :onclick => "if(this.checked) $('enterprise_fields[#{field}][signup]').checked = true;" %>  
22 <%= hidden_field_tag "enterprise_fields[#{field}][required]", false %> 21 <%= hidden_field_tag "enterprise_fields[#{field}][required]", false %>
  22 + <%= check_box_tag "enterprise_fields[#{field}][required]", true, environment.custom_enterprise_field(field, 'required'), :onclick => "if(this.checked) $('enterprise_fields[#{field}][signup]').checked = true;" %>
23 </td> 23 </td>
24 <td> 24 <td>
25 - <%= check_box_tag "enterprise_fields[#{field}][signup]", true, environment.custom_enterprise_field(field, 'signup'), :onclick => "if(!this.checked) $('enterprise_fields[#{field}][required]').checked = false;" %>  
26 <%= hidden_field_tag "enterprise_fields[#{field}][signup]", false %> 25 <%= hidden_field_tag "enterprise_fields[#{field}][signup]", false %>
  26 + <%= check_box_tag "enterprise_fields[#{field}][signup]", true, environment.custom_enterprise_field(field, 'signup'), :onclick => "if(!this.checked) $('enterprise_fields[#{field}][required]').checked = false;" %>
27 </td> 27 </td>
28 28
29 </tr> 29 </tr>
app/views/features/_manage_person_fields.rhtml
  Diff comments   View file @a4d55f5
@@ -13,16 +13,16 @@ @@ -13,16 +13,16 @@
13 <tr> 13 <tr>
14 <td><label for="person_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td> 14 <td><label for="person_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td>
15 <td> 15 <td>
16 - <%= check_box_tag "person_fields[#{field}][active]", true, environment.custom_person_field(field, 'active'), :onclick => "$('person_fields[#{field}][required]').disabled=$('person_fields[#{field}][signup]').disabled=!this.checked;" %>  
17 <%= hidden_field_tag "person_fields[#{field}][active]", false %> 16 <%= hidden_field_tag "person_fields[#{field}][active]", false %>
  17 + <%= check_box_tag "person_fields[#{field}][active]", true, environment.custom_person_field(field, 'active'), :onclick => "$('person_fields[#{field}][required]').disabled=$('person_fields[#{field}][signup]').disabled=!this.checked;" %>
18 </td> 18 </td>
19 <td> 19 <td>
20 - <%= check_box_tag "person_fields[#{field}][required]", true, environment.custom_person_field(field, 'required'), :onclick => "if(this.checked) $('person_fields[#{field}][signup]').checked = true;" %>  
21 <%= hidden_field_tag "person_fields[#{field}][required]", false %> 20 <%= hidden_field_tag "person_fields[#{field}][required]", false %>
  21 + <%= check_box_tag "person_fields[#{field}][required]", true, environment.custom_person_field(field, 'required'), :onclick => "if(this.checked) $('person_fields[#{field}][signup]').checked = true;" %>
22 </td> 22 </td>
23 <td> 23 <td>
24 - <%= check_box_tag "person_fields[#{field}][signup]", true, environment.custom_person_field(field, 'signup'), :onclick => "if(!this.checked) $('person_fields[#{field}][required]').checked = false;" %>  
25 <%= hidden_field_tag "person_fields[#{field}][signup]", false %> 24 <%= hidden_field_tag "person_fields[#{field}][signup]", false %>
  25 + <%= check_box_tag "person_fields[#{field}][signup]", true, environment.custom_person_field(field, 'signup'), :onclick => "if(!this.checked) $('person_fields[#{field}][required]').checked = false;" %>
26 </td> 26 </td>
27 </tr> 27 </tr>
28 <% end %> 28 <% end %>