Download as
Browse Code »

Commit f6978895af74f65f563f55bc1cf2d30782ad0f31

Authored by David Silva
1 parent 158cc1d2
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

Replaces block conditions to proc. 

Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Showing 1 changed file with 9 additions and 10 deletions   Show diff stats
controllers/mpog_software_plugin_myprofile_controller.rb
  Diff comments   View file @f697889
@@ -88,12 +88,7 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController @@ -88,12 +88,7 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
88 @list_operating_systems = OperatingSystemHelper.list_operating_system(params[:operating_system]) 88 @list_operating_systems = OperatingSystemHelper.list_operating_system(params[:operating_system])
89 @software_info.software_categories = @software_categories unless params[:software_categories].nil? 89 @software_info.software_categories = @software_categories unless params[:software_categories].nil?
90 90
91 - if not @list_libraries.nil?  
92 - @software_info.libraries.destroy_all  
93 - @list_libraries.each do |library|  
94 - @software_info.libraries << library  
95 - end  
96 - end 91 + software_info_insert_models.call(@list_libraries,'libraries')
97 92
98 if not @list_languages.nil? 93 if not @list_languages.nil?
99 @software_info.software_languages.destroy_all 94 @software_info.software_languages.destroy_all
@@ -128,6 +123,10 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController @@ -128,6 +123,10 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
128 end 123 end
129 end 124 end
130 125
  126 + def software_info_insert_models
  127 + proc { |list,model_attr| @software_info.send(model_attr).destroy_all; list.collect!{|m| @software_info.send(model_attr) << m } unless list.nil? }
  128 + end
  129 +
131 def disabled_public_software_field 130 def disabled_public_software_field
132 !environment.admins.include?(current_user.person) 131 !environment.admins.include?(current_user.person)
133 end 132 end
@@ -150,13 +149,13 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController @@ -150,13 +149,13 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
150 end 149 end
151 150
152 def governmental_updates 151 def governmental_updates
153 - govPower = GovernmentalPower.find params[:institutions][:governmental_power]  
154 - govSphere = GovernmentalSphere.find params[:institutions][:governmental_sphere] 152 + gov_power = GovernmentalPower.find params[:institutions][:governmental_power]
  153 + gov_sphere = GovernmentalSphere.find params[:institutions][:governmental_sphere]
155 jur_nature = JuridicalNature.find params[:institutions][:juridical_nature] 154 jur_nature = JuridicalNature.find params[:institutions][:juridical_nature]
156 155
157 @institution.juridical_nature = jur_nature 156 @institution.juridical_nature = jur_nature
158 - @institution.governmental_power = govPower  
159 - @institution.governmental_sphere = govSphere 157 + @institution.governmental_power = gov_power
  158 + @institution.governmental_sphere = gov_sphere
160 @institution.save 159 @institution.save
161 end 160 end
162 161