Download as
Browse Code »

Commit fd3d68cec637efda68fde48fd62de764a8b3bb57

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

Creates constroy_software method in mpog_software_plugin_myprofile_controller. 

  - Create private methods to use it in
    mpog_software_plugin_myprofile_controller actions.

Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Showing 1 changed file with 10 additions and 8 deletions   Show diff stats
controllers/mpog_software_plugin_myprofile_controller.rb
  Diff comments   View file @fd3d68c
@@ -25,14 +25,7 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController @@ -25,14 +25,7 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
25 else 25 else
26 LicenseInfo.find(:first, :conditions =>["version = ?","#{params[:license_info][:version]}"]) 26 LicenseInfo.find(:first, :conditions =>["version = ?","#{params[:license_info][:version]}"])
27 end 27 end
28 -  
29 - valid_models = request.post? && (@community.valid? && @software_info.valid? && @license_info.valid?)  
30 -  
31 - if valid_models  
32 - send_software_to_moderation  
33 - else  
34 - add_software_erros  
35 - end 28 + control_software_creation
36 end 29 end
37 30
38 def search_offerers 31 def search_offerers
@@ -77,6 +70,15 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController @@ -77,6 +70,15 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
77 @errors |= @license_info.errors.full_messages 70 @errors |= @license_info.errors.full_messages
78 end 71 end
79 72
  73 + def control_software_creation
  74 + valid_models = request.post? && (@community.valid? && @software_info.valid? && @license_info.valid?)
  75 + if valid_models
  76 + send_software_to_moderation
  77 + else
  78 + add_software_erros
  79 + end
  80 + end
  81 +
80 def update_institution 82 def update_institution
81 @institution.community.update_attributes(params[:community]) 83 @institution.community.update_attributes(params[:community])
82 @institution.update_attributes(params[:institutions].except(:governmental_power, :governmental_sphere, :juridical_nature)) 84 @institution.update_attributes(params[:institutions].except(:governmental_power, :governmental_sphere, :juridical_nature))