From 5f21a0f03cd7f44d7da71cdf3a417c77dab3ad4c Mon Sep 17 00:00:00 2001
From: ParleyMartins <parleypachecomartins@gmail.com>
Date: Thu, 21 Aug 2014 12:01:54 -0300
Subject: [PATCH] Fix error from creating institutions on view

---
 controllers/mpog_software_plugin_controller.rb | 4 ++--
 features/user_registration.feature             | 2 +-
 lib/ext/user.rb                                | 2 +-
 lib/institution_helper.rb                      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/controllers/mpog_software_plugin_controller.rb b/controllers/mpog_software_plugin_controller.rb
index aa20096..5d80214 100644
--- a/controllers/mpog_software_plugin_controller.rb
+++ b/controllers/mpog_software_plugin_controller.rb
@@ -159,8 +159,6 @@ class MpogSoftwarePluginController < ApplicationController
     institution.name = community[:name]
     institution.community = community
 
-    InstitutionHelper.register_institution_modification institution
-
     if institution.type == "PublicInstitution"
       begin
         govPower = GovernmentalPower.find params[:governmental][:power]
@@ -177,6 +175,8 @@ class MpogSoftwarePluginController < ApplicationController
       institution.errors.add(:cnpj, _("can't be blank"))
     end
 
+    InstitutionHelper.register_institution_modification institution
+    
     institution
   end
 
diff --git a/features/user_registration.feature b/features/user_registration.feature
index 08375e0..0ddf16c 100644
--- a/features/user_registration.feature
+++ b/features/user_registration.feature
@@ -61,10 +61,10 @@ Feature: User Registration
       | State                 | Bahia                  |
       | City                  | Salvador               |
       | Secondary e-Mail      | josesilva@example.com  |
-      | Role                  | TI analist             |
     And I select "Brazil" from "profile_data[country]"
     And I type in "Minis" into autocomplete list "input_institution" and I choose "Ministerio do Planejamento"
     And wait for the captcha signup time
+    And I follow "Add new institution"
     And I press "Create my account"
     When José da Silva's account is activated
     And I go to login page
diff --git a/lib/ext/user.rb b/lib/ext/user.rb
index 9314624..aa8b7f8 100644
--- a/lib/ext/user.rb
+++ b/lib/ext/user.rb
@@ -51,7 +51,7 @@ class User
       self.errors.add(:base, _("The governamental email must be the primary one.")) if secondary_email_has_gov_suffix
     end
 
-    self.errors.add(:base, _("Institution is obligatory if user has a government email.")) if primary_email_has_gov_suffix and self.institution.nil?
+    self.errors.add(:base, _("Institution is obligatory if user has a government email.")) if primary_email_has_gov_suffix and self.institutions.blank?
   end
 
 end
diff --git a/lib/institution_helper.rb b/lib/institution_helper.rb
index c344d62..d751cc3 100644
--- a/lib/institution_helper.rb
+++ b/lib/institution_helper.rb
@@ -49,7 +49,7 @@ module InstitutionHelper
 
   def self.register_institution_modification institution
     institution.date_modification = current_date
-    institution.save!
+    institution.save
   end
 
   protected
--
libgit2 0.21.2