Download as
Browse Code »

Commit 0906bb6dab44aada8bada2ab1e15bd200e306ba4

Authored by Thiago Ribeiro
1 parent c9b158c7
Exists in master and in 49 other branches add_sisp_to_chef, add_super_archives_plugin, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, header_fix, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, refactor_download_block, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, sisp_catalog_header, sisp_dev_master, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_to_rails4, stable-4.1, stable-4.2, theme_header, theme_javascript_refactory, thread_dropdown, update_search_by_categories, update_softwares_boxes

CNPJ should be mandatory

Showing 2 changed files with 6 additions and 2 deletions   Show diff stats
src/noosfero-spb/gov_user/lib/institution.rb
  Diff comments   View file @0906bb6
@@ -23,6 +23,7 @@ class Institution < ActiveRecord::Base @@ -23,6 +23,7 @@ class Institution < ActiveRecord::Base
23 :corporate_name, :siorg_code, :community 23 :corporate_name, :siorg_code, :community
24 24
25 validates :name, :presence=>true, :uniqueness=>true 25 validates :name, :presence=>true, :uniqueness=>true
  26 + validates :cnpj, :presence=>true, :uniqueness=>true
26 27
27 before_save :verify_institution_type 28 before_save :verify_institution_type
28 29
src/noosfero-spb/gov_user/views/gov_user_plugin/_institution.html.erb
  Diff comments   View file @0906bb6
@@ -105,7 +105,10 @@ @@ -105,7 +105,10 @@
105 105
106 <div class="spb-row"> 106 <div class="spb-row">
107 <div class="spb-col spb-col-12"> 107 <div class="spb-col spb-col-12">
108 - <%= inst.label("cnpj" ,_("CNPJ"), :class=>"formlabel") %> 108 + <label class="formlabel" for="institutions_cnpj">
  109 + <%= _("CNPJ") %>
  110 + <span class="required-field">(*)</span>
  111 + </label>
109 <%= inst.text_field(:cnpj, :placeholder=>"99.999.999/9999-99", :class=>"intitution_cnpj_field", :value => params[:institutions][:cnpj]) %> 112 <%= inst.text_field(:cnpj, :placeholder=>"99.999.999/9999-99", :class=>"intitution_cnpj_field", :value => params[:institutions][:cnpj]) %>
110 </div> 113 </div>
111 </div> 114 </div>
@@ -151,7 +154,7 @@ @@ -151,7 +154,7 @@
151 <%= inst.select(:juridical_nature, @juridical_nature, :selected=>params[:institutions][:juridical_nature], :class => flash[:error_institution_juridical_nature])%> 154 <%= inst.select(:juridical_nature, @juridical_nature, :selected=>params[:institutions][:juridical_nature], :class => flash[:error_institution_juridical_nature])%>
152 </div> 155 </div>
153 </div> 156 </div>
154 - 157 +
155 <div class="spb-row public-institutions-fields"> 158 <div class="spb-row public-institutions-fields">
156 <div class="spb-col spb-col-12"> 159 <div class="spb-col spb-col-12">
157 <%= _("SISP ?") %> 160 <%= _("SISP ?") %>