Download as
Browse Code »

Commit 26bdc8a5833effc2c6a010aba20366192358539b

Authored by David Silva
1 parent 4b43c159
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 7 additions and 4 deletions   Show diff stats
controllers/mpog_software_plugin_myprofile_controller.rb
  Diff comments   View file @26bdc8a
@@ -15,20 +15,25 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController @@ -15,20 +15,25 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
15 15
16 def new_software 16 def new_software
17 set_software_as_template 17 set_software_as_template
  18 +
18 @community = Community.new(params[:community]) 19 @community = Community.new(params[:community])
19 @community.environment = environment 20 @community.environment = environment
20 @software_info = SoftwareInfo.new(params[:software_info]) 21 @software_info = SoftwareInfo.new(params[:software_info])
21 @license_info = if params[:license_info].nil? 22 @license_info = if params[:license_info].nil?
22 LicenseInfo.new 23 LicenseInfo.new
23 else 24 else
24 - LicenseInfo.find(:first, :conditions => ["version = ?","#{params[:license_info][:version]}"]) 25 + LicenseInfo.find(:first,
  26 + :conditions => ["version = ?",
  27 + "#{params[:license_info][:version]}"])
25 end 28 end
  29 +
26 control_software_creation 30 control_software_creation
27 end 31 end
28 32
29 def search_offerers 33 def search_offerers
30 arg = params[:q].downcase 34 arg = params[:q].downcase
31 - result = environment.people.find(:all, :conditions => ['LOWER(name) LIKE ?', "%#{arg}%"]) 35 + result = environment.people.find(:all,
  36 + :conditions => [ 'LOWER(name) LIKE ?', "%#{arg}%"])
32 render :text => prepare_to_token_input(result).to_json 37 render :text => prepare_to_token_input(result).to_json
33 end 38 end
34 39
@@ -118,8 +123,6 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController @@ -118,8 +123,6 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
118 123
119 create_list_model_helpers 124 create_list_model_helpers
120 125
121 - @software_categories = SoftwareCategories::new params[:software_categories]  
122 - @software_info.software_categories = @software_categories unless params[:software_categories].nil?  
123 @software_info 126 @software_info
124 end 127 end
125 128