Download as
Browse Code »

Commit 2183feb5251fcf18f3a70ebda05f10df89fdc6fa

Authored by David Silva
1 parent db6b43ef
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 unecessary code and fix library edition 

Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Showing 2 changed files with 3 additions and 36 deletions   Show diff stats
controllers/mpog_software_plugin_myprofile_controller.rb
  Diff comments   View file @2183feb
... ... @@ -42,7 +42,7 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
42 42  
43 43 return unless request.post?
44 44 @software_info = constroy_software
45   - software_info_insert_models.call(@list_library, 'libraries')
  45 + software_info_insert_models.call(@list_libraries, 'libraries')
46 46 software_info_insert_models.call(@list_languages, 'software_languages')
47 47 software_info_insert_models.call(@list_databases, 'software_databases')
48 48 software_info_insert_models.call(@list_operating_systems, 'operating_systems')
... ...
lib/mpog_software_plugin.rb
  Diff comments   View file @2183feb
... ... @@ -35,13 +35,8 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
35 35  
36 36 def profile_editor_transaction_extras
37 37 single_hash_transactions = { :user => 'user',
38   - :software_info => 'software_info',
39   - :version => 'license', :language => 'generic_model',
40   - :operating_system => 'generic_model',
41   - :software_categories => 'software_categories',
42   - :instituton => 'instituton',
43   - :library => 'generic_model',
44   - :database => 'generic_model' }
  38 + :instituton => 'instituton'
  39 + }
45 40  
46 41 single_hash_transactions.each do |model, transaction|
47 42 call_model_transaction(model, transaction)
... ... @@ -300,34 +295,6 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
300 295 context.profile.institution.save!
301 296 end
302 297  
303   - def generic_model_transaction
304   - models_list = [
305   - [SoftwareLanguage, SoftwareLanguageHelper, 'language'],
306   - [SoftwareDatabase, DatabaseHelper, 'database'],
307   - [OperatingSystem, OperatingSystemHelper, 'operating_system'],
308   - [Library, LibraryHelper, 'library']
309   - ]
310   - models_list.each do |model|
311   - list_of_model = 'list_'+model[2].to_s
312   - model[0].transaction do
313   - list = model[1].send(list_of_model, context.params[model[2].to_sym])
314   -
315   - if model[2].send('valid_'+list_of_model+'?', list_of_model)
316   - model[0].where(
317   - :software_info_id => context.profile.software_info.id
318   - ).destroy_all
319   -
320   - list.each do |model|
321   - model.software_info = context.profile.software_info
322   - model.save!
323   - end
324   - else
325   - raise 'Invalid Software #{model[2]} fields'
326   - end
327   - end
328   - end
329   - end
330   -
331 298 def software_info_button
332 299 {
333 300 :title => _('Software Info'),
... ...