Download as
Browse Code »

Commit e999d70352a977b4bf2c33c594d206b4b818c2c1

Authored by David Silva
1 parent 74f7762e
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

Inprove myprofile_controller and mpog_software. 

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: David Calos <ddavidcarlos1392@gmail.com>
Showing 2 changed files with 6 additions and 5 deletions   Show diff stats
controllers/mpog_software_plugin_myprofile_controller.rb
  Diff comments   View file @e999d70
@@ -92,7 +92,8 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController @@ -92,7 +92,8 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
92 begin 92 begin
93 governmental_updates 93 governmental_updates
94 rescue 94 rescue
95 - @institution.errors.add(:governmental_fields, _("Could not find Governmental Power or Governmental Sphere")) 95 + @institution.errors.add(:governmental_fields,
  96 + _("Could not find Governmental Power or Governmental Sphere"))
96 end 97 end
97 end 98 end
98 flash[:errors] = @institution.errors.full_messages unless @institution.valid? 99 flash[:errors] = @institution.errors.full_messages unless @institution.valid?
lib/mpog_software_plugin.rb
  Diff comments   View file @e999d70
@@ -144,16 +144,16 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin @@ -144,16 +144,16 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
144 end 144 end
145 145
146 def profile_blocks_extra_content 146 def profile_blocks_extra_content
147 - return if context.session[:user].nil? or  
148 - !!context.session[:hide_incomplete_percentage] 147 + return if context.session[:user].nil? ||
  148 + !context.session[:hide_incomplete_percentage].blank?
149 149
150 person = Person.where(:user_id=>context.session[:user]).first 150 person = Person.where(:user_id=>context.session[:user]).first
151 151
152 - if context.profile && context.profile.person? and !person.nil? 152 + if context.profile && context.profile.person? && !person.nil?
153 @person = person 153 @person = person
154 @percentege = calc_percentage_registration(person) 154 @percentege = calc_percentage_registration(person)
155 155
156 - if @percentege >= 0 and @percentege <= 100 156 + if @percentege >= 0 && @percentege <= 100
157 expanded_template('incomplete_registration.html.erb') 157 expanded_template('incomplete_registration.html.erb')
158 end 158 end
159 end 159 end