Download as
Browse Code »

Commit a95f5e27099d87dec71172c6acf161b0dbd0fe21

Authored by Gabriela Navarro
Committed by David Silva
1 parent 3d42567f
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

Remove software categories from tests 

Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Showing 1 changed file with 2 additions and 6 deletions   Show diff stats
controllers/mpog_software_plugin_myprofile_controller.rb
  Diff comments   View file @a95f5e2
@@ -60,7 +60,7 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController @@ -60,7 +60,7 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
60 60
61 def community_must_be_approved 61 def community_must_be_approved
62 end 62 end
63 - 63 +
64 private 64 private
65 65
66 def add_software_erros 66 def add_software_erros
@@ -120,16 +120,14 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController @@ -120,16 +120,14 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
120 @list_libraries = LibraryHelper.list_libraries(params[:library]) 120 @list_libraries = LibraryHelper.list_libraries(params[:library])
121 @list_languages = SoftwareLanguageHelper.list_language(params[:language]) 121 @list_languages = SoftwareLanguageHelper.list_language(params[:language])
122 @list_databases = DatabaseHelper.list_database(params[:database]) 122 @list_databases = DatabaseHelper.list_database(params[:database])
123 - @software_categories = SoftwareCategories::new params[:software_categories]  
124 @list_operating_systems = OperatingSystemHelper.list_operating_system(params[:operating_system]) 123 @list_operating_systems = OperatingSystemHelper.list_operating_system(params[:operating_system])
125 - @software_info.software_categories = @software_categories unless params[:software_categories].nil?  
126 end 124 end
127 125
128 def send_software_to_moderation 126 def send_software_to_moderation
129 @software_info = SoftwareInfo.create_after_moderation(user, 127 @software_info = SoftwareInfo.create_after_moderation(user,
130 params[:software_info].merge({ 128 params[:software_info].merge({
131 :environment => environment, 129 :environment => environment,
132 - :name => params[:community][:name], 130 + :name => params[:community][:name],
133 :license_info => @license_info })) 131 :license_info => @license_info }))
134 unless params[:q].nil? 132 unless params[:q].nil?
135 admins = params[:q].split(/,/).map{ |n| environment.people.find n.to_i } 133 admins = params[:q].split(/,/).map{ |n| environment.people.find n.to_i }
@@ -156,8 +154,6 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController @@ -156,8 +154,6 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
156 @list_databases = @software_info.software_databases 154 @list_databases = @software_info.software_databases
157 @list_languages = @software_info.software_languages 155 @list_languages = @software_info.software_languages
158 @list_operating_systems = @software_info.operating_systems 156 @list_operating_systems = @software_info.operating_systems
159 - @software_categories = @software_info.software_categories  
160 - @software_categories = SoftwareCategories.new if @software_categories.blank?  
161 @disabled_public_software_field = disabled_public_software_field 157 @disabled_public_software_field = disabled_public_software_field
162 end 158 end
163 end 159 end