From bd921519daa01ea85e3b0e54f4319b3973a5c088 Mon Sep 17 00:00:00 2001
From: Macartur Sousa <macartur.sc@gmail.com>
Date: Mon, 30 May 2016 22:40:25 -0300
Subject: [PATCH] Fixed cancel button to avoid use javascrit action

---
 src/noosfero-spb/gov_user/public/views/create-institution.js          | 7 -------
 src/noosfero-spb/gov_user/views/gov_user_plugin/_institution.html.erb | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/noosfero-spb/gov_user/public/views/create-institution.js b/src/noosfero-spb/gov_user/public/views/create-institution.js
index 96c08f1..42d122f 100644
--- a/src/noosfero-spb/gov_user/public/views/create-institution.js
+++ b/src/noosfero-spb/gov_user/public/views/create-institution.js
@@ -164,12 +164,6 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
     });
   }
 
-  function cancel_institution(evt){
-    evt.preventDefault();
-    $('#institution_modal').modal('toggle');
-  }
-
-
   function institution_already_exists(){
     if( this.value.length >= 3 ) {
       $.get(AJAX_URL.institution_already_exists, {name:this.value}, function(response){
@@ -373,7 +367,6 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
     });
 
     $('#save_institution_button').click(save_institution);
-    $('#cancel_institution_button').click(cancel_institution);
 
     $("#community_name").keyup(institution_already_exists);
 
diff --git a/src/noosfero-spb/gov_user/views/gov_user_plugin/_institution.html.erb b/src/noosfero-spb/gov_user/views/gov_user_plugin/_institution.html.erb
index f52d967..eea86ed 100644
--- a/src/noosfero-spb/gov_user/views/gov_user_plugin/_institution.html.erb
+++ b/src/noosfero-spb/gov_user/views/gov_user_plugin/_institution.html.erb
@@ -181,7 +181,7 @@
           <%= button(:cancel, _("Cancel"), {:controller => "admin_panel", :action => 'index'}) %>
         <% else %>
            <%= link_to(_('Save'), '#', :id=>'save_institution_button', :class=>'button with-text icon-add') %>
-           <%= link_to(_('Cancel'), '#', :id=>"cancel_institution_button", :class=>'button with-text icon-cancel') %>
+           <%= link_to(_('Cancel'), '#', :id=>"cancel_institution_button", :class=>'button with-text icon-cancel', "data-dismiss".to_sym => "modal") %>
            <%= hidden_field_tag :institution_error_message, _("Could not send the form data to the server") %>
         <% end %>
       </div>
--
libgit2 0.21.2