From 2183feb5251fcf18f3a70ebda05f10df89fdc6fa Mon Sep 17 00:00:00 2001 From: David Carlos Date: Tue, 6 Jan 2015 00:26:24 +0000 Subject: [PATCH] Remove unecessary code and fix library edition --- controllers/mpog_software_plugin_myprofile_controller.rb | 2 +- lib/mpog_software_plugin.rb | 37 ++----------------------------------- 2 files changed, 3 insertions(+), 36 deletions(-) diff --git a/controllers/mpog_software_plugin_myprofile_controller.rb b/controllers/mpog_software_plugin_myprofile_controller.rb index 8dfc9f2..70a50b1 100644 --- a/controllers/mpog_software_plugin_myprofile_controller.rb +++ b/controllers/mpog_software_plugin_myprofile_controller.rb @@ -42,7 +42,7 @@ class MpogSoftwarePluginMyprofileController < MyProfileController return unless request.post? @software_info = constroy_software - software_info_insert_models.call(@list_library, 'libraries') + software_info_insert_models.call(@list_libraries, 'libraries') software_info_insert_models.call(@list_languages, 'software_languages') software_info_insert_models.call(@list_databases, 'software_databases') software_info_insert_models.call(@list_operating_systems, 'operating_systems') diff --git a/lib/mpog_software_plugin.rb b/lib/mpog_software_plugin.rb index c09147b..1193d2f 100644 --- a/lib/mpog_software_plugin.rb +++ b/lib/mpog_software_plugin.rb @@ -35,13 +35,8 @@ class MpogSoftwarePlugin < Noosfero::Plugin def profile_editor_transaction_extras single_hash_transactions = { :user => 'user', - :software_info => 'software_info', - :version => 'license', :language => 'generic_model', - :operating_system => 'generic_model', - :software_categories => 'software_categories', - :instituton => 'instituton', - :library => 'generic_model', - :database => 'generic_model' } + :instituton => 'instituton' + } single_hash_transactions.each do |model, transaction| call_model_transaction(model, transaction) @@ -300,34 +295,6 @@ class MpogSoftwarePlugin < Noosfero::Plugin context.profile.institution.save! end - def generic_model_transaction - models_list = [ - [SoftwareLanguage, SoftwareLanguageHelper, 'language'], - [SoftwareDatabase, DatabaseHelper, 'database'], - [OperatingSystem, OperatingSystemHelper, 'operating_system'], - [Library, LibraryHelper, 'library'] - ] - models_list.each do |model| - list_of_model = 'list_'+model[2].to_s - model[0].transaction do - list = model[1].send(list_of_model, context.params[model[2].to_sym]) - - if model[2].send('valid_'+list_of_model+'?', list_of_model) - model[0].where( - :software_info_id => context.profile.software_info.id - ).destroy_all - - list.each do |model| - model.software_info = context.profile.software_info - model.save! - end - else - raise 'Invalid Software #{model[2]} fields' - end - end - end - end - def software_info_button { :title => _('Software Info'), -- libgit2 0.21.2