Download as
Browse Code »

Commit 5f21a0f03cd7f44d7da71cdf3a417c77dab3ad4c

Authored by Parley
1 parent 1f4925d4
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, 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_api, 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, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Fix error from creating institutions on view 

Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Signed-off-by: Parley Martins <parley@outlook.com>
             '
Showing 4 changed files with 5 additions and 5 deletions   Show diff stats
controllers/mpog_software_plugin_controller.rb
  Diff comments   View file @5f21a0f
... ... @@ -159,8 +159,6 @@ class MpogSoftwarePluginController &lt; ApplicationController
159 159 institution.name = community[:name]
160 160 institution.community = community
161 161  
162   - InstitutionHelper.register_institution_modification institution
163   -
164 162 if institution.type == "PublicInstitution"
165 163 begin
166 164 govPower = GovernmentalPower.find params[:governmental][:power]
... ... @@ -177,6 +175,8 @@ class MpogSoftwarePluginController &lt; ApplicationController
177 175 institution.errors.add(:cnpj, _("can't be blank"))
178 176 end
179 177  
  178 + InstitutionHelper.register_institution_modification institution
  179 +
180 180 institution
181 181 end
182 182  
... ...
features/user_registration.feature
  Diff comments   View file @5f21a0f
... ... @@ -61,10 +61,10 @@ Feature: User Registration
61 61 | State | Bahia |
62 62 | City | Salvador |
63 63 | Secondary e-Mail | josesilva@example.com |
64   - | Role | TI analist |
65 64 And I select "Brazil" from "profile_data[country]"
66 65 And I type in "Minis" into autocomplete list "input_institution" and I choose "Ministerio do Planejamento"
67 66 And wait for the captcha signup time
  67 + And I follow "Add new institution"
68 68 And I press "Create my account"
69 69 When José da Silva's account is activated
70 70 And I go to login page
... ...
lib/ext/user.rb
  Diff comments   View file @5f21a0f
... ... @@ -51,7 +51,7 @@ class User
51 51 self.errors.add(:base, _("The governamental email must be the primary one.")) if secondary_email_has_gov_suffix
52 52 end
53 53  
54   - self.errors.add(:base, _("Institution is obligatory if user has a government email.")) if primary_email_has_gov_suffix and self.institution.nil?
  54 + self.errors.add(:base, _("Institution is obligatory if user has a government email.")) if primary_email_has_gov_suffix and self.institutions.blank?
55 55 end
56 56  
57 57 end
... ...
lib/institution_helper.rb
  Diff comments   View file @5f21a0f
... ... @@ -49,7 +49,7 @@ module InstitutionHelper
49 49  
50 50 def self.register_institution_modification institution
51 51 institution.date_modification = current_date
52   - institution.save!
  52 + institution.save
53 53 end
54 54  
55 55 protected
... ...