Commit 5f21a0f03cd7f44d7da71cdf3a417c77dab3ad4c
1 parent
1f4925d4
Exists in
master
and in
5 other branches
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
| @@ -159,8 +159,6 @@ class MpogSoftwarePluginController < ApplicationController | @@ -159,8 +159,6 @@ class MpogSoftwarePluginController < ApplicationController | ||
| 159 | institution.name = community[:name] | 159 | institution.name = community[:name] |
| 160 | institution.community = community | 160 | institution.community = community |
| 161 | 161 | ||
| 162 | - InstitutionHelper.register_institution_modification institution | ||
| 163 | - | ||
| 164 | if institution.type == "PublicInstitution" | 162 | if institution.type == "PublicInstitution" |
| 165 | begin | 163 | begin |
| 166 | govPower = GovernmentalPower.find params[:governmental][:power] | 164 | govPower = GovernmentalPower.find params[:governmental][:power] |
| @@ -177,6 +175,8 @@ class MpogSoftwarePluginController < ApplicationController | @@ -177,6 +175,8 @@ class MpogSoftwarePluginController < ApplicationController | ||
| 177 | institution.errors.add(:cnpj, _("can't be blank")) | 175 | institution.errors.add(:cnpj, _("can't be blank")) |
| 178 | end | 176 | end |
| 179 | 177 | ||
| 178 | + InstitutionHelper.register_institution_modification institution | ||
| 179 | + | ||
| 180 | institution | 180 | institution |
| 181 | end | 181 | end |
| 182 | 182 |
features/user_registration.feature
| @@ -61,10 +61,10 @@ Feature: User Registration | @@ -61,10 +61,10 @@ Feature: User Registration | ||
| 61 | | State | Bahia | | 61 | | State | Bahia | |
| 62 | | City | Salvador | | 62 | | City | Salvador | |
| 63 | | Secondary e-Mail | josesilva@example.com | | 63 | | Secondary e-Mail | josesilva@example.com | |
| 64 | - | Role | TI analist | | ||
| 65 | And I select "Brazil" from "profile_data[country]" | 64 | And I select "Brazil" from "profile_data[country]" |
| 66 | And I type in "Minis" into autocomplete list "input_institution" and I choose "Ministerio do Planejamento" | 65 | And I type in "Minis" into autocomplete list "input_institution" and I choose "Ministerio do Planejamento" |
| 67 | And wait for the captcha signup time | 66 | And wait for the captcha signup time |
| 67 | + And I follow "Add new institution" | ||
| 68 | And I press "Create my account" | 68 | And I press "Create my account" |
| 69 | When José da Silva's account is activated | 69 | When José da Silva's account is activated |
| 70 | And I go to login page | 70 | And I go to login page |
lib/ext/user.rb
| @@ -51,7 +51,7 @@ class User | @@ -51,7 +51,7 @@ class User | ||
| 51 | self.errors.add(:base, _("The governamental email must be the primary one.")) if secondary_email_has_gov_suffix | 51 | self.errors.add(:base, _("The governamental email must be the primary one.")) if secondary_email_has_gov_suffix |
| 52 | end | 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 | end | 55 | end |
| 56 | 56 | ||
| 57 | end | 57 | end |
lib/institution_helper.rb
| @@ -49,7 +49,7 @@ module InstitutionHelper | @@ -49,7 +49,7 @@ module InstitutionHelper | ||
| 49 | 49 | ||
| 50 | def self.register_institution_modification institution | 50 | def self.register_institution_modification institution |
| 51 | institution.date_modification = current_date | 51 | institution.date_modification = current_date |
| 52 | - institution.save! | 52 | + institution.save |
| 53 | end | 53 | end |
| 54 | 54 | ||
| 55 | protected | 55 | protected |