Download as
Browse Code »

Commit b072751007c3198bab9acda5db2cb278c60b4c7f

Authored by Fabio Teixeira
1 parent 6b03fc9c
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

incomplete_registration: Using context user and changed the hot spot 

Signed-off-by: Fabio Teixeira  <fabio1079@gmail.com>
Signed-off-by: Parley Martins <parley@outlook.com>
Showing 3 changed files with 39 additions and 41 deletions   Show diff stats
lib/mpog_software_plugin.rb
  Diff comments   View file @b072751
... ... @@ -151,21 +151,19 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
151 151 end
152 152  
153 153  
154   - def incomplete_registration params
155   - return if params.nil? or params[:user].nil?
  154 + def body_middle
  155 + return if context.session[:user].nil? or context.session[:hide_incomplete_percentage] == true
156 156  
157   - person = if params[:user].kind_of? User
158   - User.find(params[:user]).person
159   - else
160   - params[:user]
161   - end
  157 + person = Person.where(:user_id=>context.session[:user]).first
162 158  
163   - @profile_edit_link = link_to _("Complete your registration"), "/myprofile/#{person.identifier}/profile_editor/edit"
164   - @profile_empty_fields = profile_required_empty_list person
165   - @percentege = calc_percentage_registration(person)
  159 + unless person.nil?
  160 + @profile_edit_link = link_to _("Complete your registration"), "/myprofile/#{person.identifier}/profile_editor/edit"
  161 + @profile_empty_fields = profile_required_empty_list person
  162 + @percentege = calc_percentage_registration(person)
166 163  
167   - if @percentege >= 0 and @percentege <= 100 and context.session[:hide_incomplete_percentage] != true
168   - expanded_template('mpog_software_plugin_myprofile/_incomplete_registration.html.erb')
  164 + if @percentege >= 0 and @percentege <= 100
  165 + expanded_template('incomplete_registration.html.erb')
  166 + end
169 167 end
170 168 end
171 169  
... ...
views/incomplete_registration.html.erb 0 → 100644
  Diff comments   View file @b072751
... ... @@ -0,0 +1,29 @@
  1 +<div id='incomplete_registration'>
  2 + <div id="incomplete_percentage">
  3 + <%= _("Incomplete registration percentage")+":#{@percentege}%" %>
  4 + </div>
  5 +
  6 + <div id="profile_empty_fields">
  7 + <span><%= _("List with fields to be filled")+":" %></span>
  8 + <ul>
  9 + <% @profile_empty_fields.each do |field|%>
  10 + <li>
  11 + <%= field %>
  12 + </li>
  13 + <% end %>
  14 + </ul>
  15 + </div>
  16 +
  17 + <div id="profile_links">
  18 + <table>
  19 + <tr>
  20 + <td>
  21 + <%= @profile_edit_link %>
  22 + </td>
  23 + <td>
  24 + <%= link_to _("Hide this message"), "#", :class=>"hide-incomplete-percentage" %></a>
  25 + </td>
  26 + </tr>
  27 + </table>
  28 + </div>
  29 +</div>
... ...
views/mpog_software_plugin_myprofile/_incomplete_registration.html.erb
View file @6b03fc9
... ... @@ -1,29 +0,0 @@
1   -<div id='incomplete_registration'>
2   - <div id="incomplete_percentage">
3   - <%= _("Incomplete registration percentage")+":#{@percentege}%" %>
4   - </div>
5   -
6   - <div id="profile_empty_fields">
7   - <span><%= _("List with fields to be filled")+":" %></span>
8   - <ul>
9   - <% @profile_empty_fields.each do |field|%>
10   - <li>
11   - <%= field %>
12   - </li>
13   - <% end %>
14   - </ul>
15   - </div>
16   -
17   - <div id="profile_links">
18   - <table>
19   - <tr>
20   - <td>
21   - <%= @profile_edit_link %>
22   - </td>
23   - <td>
24   - <%= link_to _("Hide this message"), "#", :class=>"hide-incomplete-percentage" %></a>
25   - </td>
26   - </tr>
27   - </table>
28   - </div>
29   -</div>