diff --git a/src/noosfero-spb/gov_user/controllers/gov_user_plugin_controller.rb b/src/noosfero-spb/gov_user/controllers/gov_user_plugin_controller.rb index 9b7b1de..e9c9870 100644 --- a/src/noosfero-spb/gov_user/controllers/gov_user_plugin_controller.rb +++ b/src/noosfero-spb/gov_user/controllers/gov_user_plugin_controller.rb @@ -5,7 +5,7 @@ class GovUserPluginController < ApplicationController :governmental_sphere, :governmental_power, :juridical_nature, :sisp ] - protect "create_institution_admin", :environment + protect 'create_institution_admin', :environment, :only => [:create_institution_admin] def hide_registration_incomplete_percentage response = false diff --git a/src/noosfero-spb/gov_user/features/institution_registration.feature b/src/noosfero-spb/gov_user/features/institution_registration.feature index 8aebfa1..1778592 100644 --- a/src/noosfero-spb/gov_user/features/institution_registration.feature +++ b/src/noosfero-spb/gov_user/features/institution_registration.feature @@ -16,7 +16,8 @@ Feature: Institution Field @selenium Scenario: Show new institution fields when clicked in create new institution - Given I follow "Edit Profile" + Given I follow "Control panel" + And I follow "Edit Profile" When I follow "Create new institution" And I should see "New Institution" And I should see "Public Institution" @@ -35,7 +36,8 @@ Feature: Institution Field @selenium Scenario: Clean state and city values when country is diferent of Brazil - Given I follow "Edit Profile" + Given I follow "Control panel" + And I follow "Edit Profile" When I follow "Create new institution" And I select "Brazil" from "community_country" And I select "Distrito Federal" from "community_state" diff --git a/src/noosfero-spb/gov_user/features/rating_institution_registration.feature b/src/noosfero-spb/gov_user/features/rating_institution_registration.feature index 7467f43..880c632 100644 --- a/src/noosfero-spb/gov_user/features/rating_institution_registration.feature +++ b/src/noosfero-spb/gov_user/features/rating_institution_registration.feature @@ -25,9 +25,9 @@ Feature: Create institution on user report And I should not see "Saved resources" And I should not see "Organization name or Enterprise name" When I click on anything with selector "comments-additional-information" - Then I should see "Número de beneficiados" - And I should see "Nome do órgão ou empresa" - And I should see "Recursos economizados" + Then I should see "Number of Beneficiaries" + And I should see "Organization Name or Enterprise Name" + And I should see "Saved Resources" @selenium Scenario: Show new institution fields when clicked in add new institution @@ -61,7 +61,7 @@ Feature: Create institution on user report When I click on anything with selector "create_institution_link" And I fill in "community_name" with "Noosfero Institution" And I select "United States" from "Country" - And I sleep for 1 seconds + And I sleep for 2 seconds And I follow "Save" Then I should see "Noosfero Institution" diff --git a/src/noosfero-spb/noosfero-spb-theme/theme.js b/src/noosfero-spb/noosfero-spb-theme/theme.js index 4d5ef43..d413944 100644 --- a/src/noosfero-spb/noosfero-spb-theme/theme.js +++ b/src/noosfero-spb/noosfero-spb-theme/theme.js @@ -224,22 +224,6 @@ $('#link-buscar').click(function(e) { $("#institution_modal").css({'display':'none'}); } - - function set_use_report_content() { - $('.profile-homepage .organization-average-rating-container .rate-this-organization a').html('Avalie este software'); - $('.make-report-block .make-report-container .button-bar a span').html('Avalie este software'); - $('.star-rate-data .star-rate-form.rating-cooldown .button-bar a span').html('Avalie este software'); - $('.make-report-block .make-report-container .make-report-message').html('Relate sua experiência ou do órgão/empresa com relação ao software.'); - $('.ratings-list .see-more a.icon-arrow-right-p').html('veja todos os relatos'); - $('.main-content .star-rate-data .star-rate-form .star-comment-container .button-bar input').attr('value', 'Enviar'); - $('.main-content .star-rate-data .star-rate-form .star-rate-text').html('Avalie este software'); - $('.main-content .star-rate-data .star-rate-form .star-comment-container .formlabel').html('Depoimento sobre o software'); - $('.star-rate-form .star-comment-container .comments-display-fields span#comments-additional-information').html('Dados adicionais (órgãos e empresas)'); - $('.star-rate-form .star-comment-container .comments-software-extra-fields #input_institution_comments label').html('Nome do órgão ou empresa'); - $('.star-rate-form .star-comment-container .comments-software-extra-fields .comments-software-people-benefited label').html('Número de beneficiados'); - $('.star-rate-form .star-comment-container .comments-software-extra-fields .comments-software-saved-values label').html('Recursos economizados'); - } - function add_tooltips(){ $('#content span[title]').attr("data-toggle","tooltip"); @@ -295,7 +279,6 @@ $('#link-buscar').click(function(e) { set_uploaded_files_names(); set_tooltip_content(); set_arrow_direction(); - set_use_report_content(); setEvents(); remove_suspension_points_in_buttons(); replace_send_email_button_text(); -- libgit2 0.21.2