Merge branch 'fix_edit_institution' into 'master'

Fix edit institution page Correções na página de edição da instituição - Controle de permissão - Bugs no javascript (campos do formulário ocultos indevidamente ou parcialmente) - Correção no teste funcional de edição de instituição Closes #427 See merge request !144

Merge branch 'fix_edit_institution' into 'master'
Fix edit institution page Correções na página de edição da instituição - Controle de permissão - Bugs no javascript (campos do formulário ocultos indevidamente ou parcialmente) - Correção no teste funcional de edição de instituição Closes #427 See merge request !144
Daniela Feitosa
2 parents 68455ecc 4232b460
Showing 7 changed files with 69 additions and 54 deletions Show diff stats
src/noosfero-spb/gov_user/controllers/gov_user_plugin_myprofile_controller.rb
src/noosfero-spb/gov_user/db/migrate/20160113194207_fix_institutions_with_wrong_country.rb
src/noosfero-spb/gov_user/public/views/create-institution.js
src/noosfero-spb/gov_user/public/views/new-community.js
src/noosfero-spb/gov_user/test/functional/gov_user_plugin_myprofile_controller.rb
src/noosfero-spb/gov_user/views/gov_user_plugin_myprofile/edit_institution.html.erb
src/noosfero-spb/software_communities/public/views/new-community.js
 class GovUserPluginMyprofileController < MyProfileController
   append_view_path File.join(File.dirname(__FILE__) + '/../views')
+  protect "edit_institution", :profile
+
   def index
   end
@@ -19,7 +21,7 @@ class GovUserPluginMyprofileController &lt; MyProfileController
   def update_institution
     @institution.community.update_attributes(params[:community])
-    @institution.update_attributes(params[:institutions].except(:governmental_power, :governmental_sphere, :juridical_nature))
+    @institution.update_attributes(params[:institutions].except(:governmental_power, :governmental_sphere, :juridical_nature).merge({:name => params[:community][:name]}))
     if @institution.type == "PublicInstitution"
       begin
         governmental_updates
@@ -0,0 +1,16 @@
+class FixInstitutionsWithWrongCountry < ActiveRecord::Migration
+  def up
+    select_all("SELECT id, data FROM profiles WHERE type = 'Community'").each do |community|
+      settings = YAML.load(community['data'] || {}.to_yaml)
+      if !settings[:country].nil? && settings[:country].downcase == "brasil"
+        settings[:country] = 'BR'
+        assignments = ActiveRecord::Base.send(:sanitize_sql_for_assignment, {:data => settings.to_yaml})
+        update("UPDATE profiles SET %s WHERE id = %d" % [assignments, community['id']])
+      end
+    end
+  end
+
+  def down
+    say "This migration can't be reverted."
+  end
+end
@@ -29,6 +29,7 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
     $(".public-institutions-fields").hide();
     $("#institutions_governmental_power option").selected(0);
     $("#institutions_governmental_sphere option").selected(0);
+    $("#institutions_juridical_nature option").selected(0);
     $("#cnpj_required_field_mark").html("(*)");
   }
@@ -270,8 +271,9 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
   function show_hide_cnpj_city(country) {
-    var cnpj = $("#institutions_cnpj").parent();
+    var cnpj = $("#institutions_cnpj").parent().parent();
     var city = $("#community_city").parent();
+    var city_label = $('label[for="community_city"]');
     var state = $("#community_state").parent();
     var inst_type = $("input[name='institutions[type]']:checked").val();
@@ -284,11 +286,13 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
     if ( country !== "BR" ) {
       cnpj.hide();
-      city.hide();
+      city.find('input').val(''); city.hide();
+      city_label.hide();
       state.hide();
     } else {
       cnpj.show();
       city.show();
+      city_label.show();
       state.show();
     }
   }
@@ -368,7 +372,7 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
   function set_events() {
     $("input[name='institutions[type]']").click(function(){
       institution_type_actions(this.value);
-    }).trigger("click");
+    });
     $('#save_institution_button').click(save_institution);
     $('#cancel_institution_button').click(cancel_institution);
@@ -2,11 +2,6 @@
 modulejs.define("NewCommunity", ['jquery'], function($) {
-  function replace_mandatory_message() {
-    $(".required-field").first()
-    .replaceWith("<span class='required-field'> Os campos em destaque<label class='pseudoformlabel'> (*)</label> são obrigatórios. </span>");
-  }
-
   function remove_image_builder_text() {
     $("label:contains('Image builder')").hide();
   }
@@ -22,7 +17,6 @@ modulejs.define(&quot;NewCommunity&quot;, [&#39;jquery&#39;], function($) {
     },
     init: function() {
-      replace_mandatory_message();
       remove_image_builder_text();
       hide_organization_template_fields();
     }
@@ -18,29 +18,30 @@ class GovUserPluginMyprofileControllerTest &lt; ActionController::TestCase
     @offer_1 = create_user('Ana de Souza')
     @offer_2 = create_user('Angelo Roberto')
-    login_as(@person.user_login)
-    @environment = Environment.default
-    @environment.enable_plugin('GovUserPlugin')
-    @environment.save!
-  end
-  should "user edit its community institution" do
-    govPower = GovernmentalPower.create(:name=>"Some Gov Power")
-    govSphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")
+    gov_power = GovernmentalPower.create(:name=>"Some Gov Power")
+    gov_sphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")
     juridical_nature = JuridicalNature.create(:name => "Autarquia")
-
-    institution = InstitutionTestHelper.create_public_institution(
+    @institution = InstitutionTestHelper.create_public_institution(
       "Ministerio Publico da Uniao",
       "MPU",
       "BR",
       "DF",
       "Gama",
       juridical_nature,
-      govPower,
-      govSphere,
+      gov_power,
+      gov_sphere,
       "12.345.678/9012-45"
     )
-    identifier = institution.community.identifier
+    login_as(@person.user_login)
+    @environment = Environment.default
+    @environment.enable_plugin('GovUserPlugin')
+    @environment.save!
+  end
+
+  should "admin user edit an institution" do
+    @institution.community.add_admin @person
+    identifier = @institution.community.identifier
     fields = InstitutionTestHelper.generate_form_fields(
       "institution new name",
@@ -53,7 +54,7 @@ class GovUserPluginMyprofileControllerTest &lt; ActionController::TestCase
     post(
       :edit_institution,
-      :profile=>institution.community.identifier,
+      :profile=>@institution.community.identifier,
       :community=>fields[:community],
       :institutions=>fields[:institutions]
     )
@@ -62,25 +63,31 @@ class GovUserPluginMyprofileControllerTest &lt; ActionController::TestCase
     assert_not_equal "Ministerio Publico da Uniao", institution.community.name
   end
-  should "not user edit its community institution with wrong values" do
-    govPower = GovernmentalPower.create(:name=>"Some Gov Power")
-    govSphere = GovernmentalSphere.create(:name=>"Some Gov Sphere")
-    juridical_nature = JuridicalNature.create(:name => "Autarquia")
-
-    institution = InstitutionTestHelper.create_public_institution(
-      "Ministerio Publico da Uniao",
-      "MPU",
+  should "regular user should not edit an institution" do
+    identifier = @institution.community.identifier
+    fields = InstitutionTestHelper.generate_form_fields(
+      "institution new name",
       "BR",
       "DF",
       "Gama",
-      juridical_nature,
-      govPower,
-      govSphere,
-      "12.345.678/9012-45"
+      "12.345.678/9012-45",
+      "PrivateInstitution"
+    )
+
+    post(
+      :edit_institution,
+      :profile=>@institution.community.identifier,
+      :community=>fields[:community],
+      :institutions=>fields[:institutions]
     )
-    identifier = institution.community.identifier
+    institution = Community[identifier].institution
+    assert_equal "Ministerio Publico da Uniao", institution.community.name
+    assert_response 403
+  end
+  should "not user edit its community institution with wrong values" do
+    identifier = @institution.community.identifier
     fields = InstitutionTestHelper.generate_form_fields(
       "",
       "BR",
@@ -92,7 +99,7 @@ class GovUserPluginMyprofileControllerTest &lt; ActionController::TestCase
     post(
       :edit_institution,
-      :profile=>institution.community.identifier,
+      :profile=>@institution.community.identifier,
       :community=>fields[:community],
       :institutions=>fields[:institutions]
     )
@@ -19,6 +19,10 @@
 <div id = 'create_institution_errors' class='errorExplanation hide-field'></div>
+<div class="spb-row spb-col spb-col-12 required-field">
+  <%= _("The highlighted fields are mandatory") %>
+</div>
+
 <div>
   <%= labelled_form_for :community,:html => { :multipart => true, :id=>"institution_form" } do |f| %>
     <%= hidden_field_tag "edit_institution_page", true %>
@@ -26,25 +30,19 @@
       <span class=''>
           <div class='formfield type-radio'>
             <label> <%= _("Public Institution") %>
-              <%= radio_button_tag("institutions[type]", "PublicInstitution", (@institution.type == "PublicInstitution" ? true : false)) %>
+              <%= radio_button_tag("institutions[type]", "PublicInstitution", (@institution.type == "PublicInstitution")) %>
             </label>
             <label>
               <%= _("Private Institution") %>
-              <%= radio_button_tag("institutions[type]" ,"PrivateInstitution", (@institution.type == "PrivateInstitution" ? true : false))%>
+              <%= radio_button_tag("institutions[type]" ,"PrivateInstitution", (@institution.type == "PrivateInstitution"))%>
             </label>
           </div>
         </span>
-      <%= required f.text_field(:name, :value => @institution.community.name) %>
-      <%= content_tag :span, _("Institution name already exists"), :id=>"already_exists_text", :class=>"errorExplanation hide-field" %>
+      <%= required labelled_form_field(_('Corporate Name'), text_field_tag('community[name]', @institution.community.name)) %>
-      <span class='required-field'>
-        <div class="formfield type-text">
-          <%= inst.label "corporate_name", _("Corporate Name"), :class=>"formlabel" %>
-          <%= required inst.text_field(:corporate_name, :value => @institution.corporate_name) %>
-        </div>
-      </span>
+      <%= labelled_form_field(_('Fantasy name'), inst.text_field(:corporate_name, :value => @institution.corporate_name)) %>
       <%= required select_country(_('Country'), 'community', 'country', {:class => 'type-select', :id => "community_country"}, :selected => @institution.community.country) %>
 modulejs.define("NewCommunity", ['jquery'], function($) {
-  function replace_mandatory_message() {
-    $(".required-field").first()
-    .replaceWith("<span class='required-field'> Os campos em destaque<label class='pseudoformlabel'> (*)</label> são obrigatórios. </span>");
-  }
-
   function remove_image_builder_text() {
     $("label:contains('Image builder')").hide();
   }
@@ -20,7 +15,6 @@ modulejs.define(&quot;NewCommunity&quot;, [&#39;jquery&#39;], function($) {
     },
     init: function() {
-      replace_mandatory_message();
       remove_image_builder_text();
       hide_organization_template_fields();
     }
@@ -0,0 +1,16 @@		@@ -0,0 +1,16 @@
	1	+class FixInstitutionsWithWrongCountry < ActiveRecord::Migration
	2	+ def up
	3	+ select_all("SELECT id, data FROM profiles WHERE type = 'Community'").each do \|community\|
	4	+ settings = YAML.load(community['data'] \|\| {}.to_yaml)
	5	+ if !settings[:country].nil? && settings[:country].downcase == "brasil"
	6	+ settings[:country] = 'BR'
	7	+ assignments = ActiveRecord::Base.send(:sanitize_sql_for_assignment, {:data => settings.to_yaml})
	8	+ update("UPDATE profiles SET %s WHERE id = %d" % [assignments, community['id']])
	9	+ end
	10	+ end
	11	+ end
	12	+
	13	+ def down
	14	+ say "This migration can't be reverted."
	15	+ end
	16	+end