Commit 2168bebee517098f0722a0c9a23b0d77b3201ba7

Authored by Parley
Committed by Luciano Prestes
1 parent 97a4f4ad
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Fix link to "Complete your profile"

Signed-off-by: Parley Martins <parley@outlook.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
features/user_profile_edition.feature
@@ -23,6 +23,11 @@ Feature: Institution Field @@ -23,6 +23,11 @@ Feature: Institution Field
23 | Ministerio do Planejamento | MP | BR | DF | Brasilia | 41.769.591/0001-43 | Autarquia | Judiciario | Federal | Ministerio do Planejamento | 23 | Ministerio do Planejamento | MP | BR | DF | Brasilia | 41.769.591/0001-43 | Autarquia | Judiciario | Federal | Ministerio do Planejamento |
24 And I am logged in as mpog_admin 24 And I am logged in as mpog_admin
25 25
  26 + Scenario: Go to control panel when clicked on 'Complete your profile' link
  27 + When I follow "Complete your profile"
  28 + Then I should see "Profile settings for "
  29 + And I should see "Personal information"
  30 +
26 @selenium 31 @selenium
27 Scenario: Add more then one instituion on profile editor 32 Scenario: Add more then one instituion on profile editor
28 Given I follow "Edit Profile" 33 Given I follow "Edit Profile"
lib/mpog_software_plugin.rb
@@ -7,6 +7,9 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin @@ -7,6 +7,9 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
7 include FormsHelper 7 include FormsHelper
8 include LibraryHelper 8 include LibraryHelper
9 include InstitutionHelper 9 include InstitutionHelper
  10 + include ActionView::Helpers
  11 + include ActionDispatch::Routing
  12 + include Rails.application.routes.url_helpers
10 13
11 def self.plugin_name 14 def self.plugin_name
12 "MpogSoftwarePlugin" 15 "MpogSoftwarePlugin"
@@ -228,9 +231,11 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin @@ -228,9 +231,11 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
228 return if context.session[:user].nil? or context.session[:hide_incomplete_percentage] == true 231 return if context.session[:user].nil? or context.session[:hide_incomplete_percentage] == true
229 232
230 person = Person.where(:user_id=>context.session[:user]).first 233 person = Person.where(:user_id=>context.session[:user]).first
  234 +
231 if context.profile && context.profile.person? and !person.nil? 235 if context.profile && context.profile.person? and !person.nil?
232 - @profile_edit_link = link_to _("Complete your profile"), "/myprofile/#{person.identifier}/profile_editor/edit" 236 + @person = person
233 @percentege = calc_percentage_registration(person) 237 @percentege = calc_percentage_registration(person)
  238 +
234 if @percentege >= 0 and @percentege <= 100 239 if @percentege >= 0 and @percentege <= 100
235 expanded_template('incomplete_registration.html.erb') 240 expanded_template('incomplete_registration.html.erb')
236 end 241 end
views/incomplete_registration.html.erb
@@ -4,9 +4,9 @@ @@ -4,9 +4,9 @@
4 <div><%= _("Complete Profile")+": <span>#{@percentege}</span>%" %></div> 4 <div><%= _("Complete Profile")+": <span>#{@percentege}</span>%" %></div>
5 <canvas id="complete_registration_percentage" width="100%" height="20"></canvas> 5 <canvas id="complete_registration_percentage" width="100%" height="20"></canvas>
6 <div> 6 <div>
7 - <%= @profile_edit_link %> | 7 + <%= link_to _("Complete your profile"), { :profile=>@person.identifier, :controller=>"profile_editor", :action=> "edit" } %> |
8 <%= link_to _("Hide"), "#", :class=>"hide-incomplete-percentage" %> 8 <%= link_to _("Hide"), "#", :class=>"hide-incomplete-percentage" %>
9 </div> 9 </div>
10 </div> 10 </div>
11 </div> 11 </div>
12 -<% end %>  
13 \ No newline at end of file 12 \ No newline at end of file
  13 +<% end %>