diff --git a/controllers/mpog_software_plugin_myprofile_controller.rb b/controllers/mpog_software_plugin_myprofile_controller.rb index f0af744..9f07cf7 100644 --- a/controllers/mpog_software_plugin_myprofile_controller.rb +++ b/controllers/mpog_software_plugin_myprofile_controller.rb @@ -56,7 +56,7 @@ class MpogSoftwarePluginMyprofileController < MyProfileController @errors |= @software_info.errors.full_messages @errors |= @license_info.errors.full_messages # @errors |= @software_categories.errors.full_messages - #end + end end def search_offerers @@ -66,44 +66,48 @@ class MpogSoftwarePluginMyprofileController < MyProfileController end def edit_software - @list_libraries = LibraryHelper.list_libraries(params[:library]) - @list_languages = SoftwareLanguageHelper.list_language(params[:language]) - @list_databases = DatabaseHelper.list_database(params[:database]) - @software_categories = SoftwareCategories::new params[:software_categories] - @list_operating_systems = OperatingSystemHelper.list_operating_system(params[:operating_system]) - - - if not @list_libraries.nil? - @list_libraries.each do |library| - @software_info.libraries << library - end - end - - if not @list_languages.nil? - @list_languages.each do |language| - @software_info.software_languages << language - end - end - - if not @list_databases.nil? - @list_databases.each do |database| - @software_info.software_databases << database - end - end - - if not @list_operating_systems.nil? - @list_operating_systems.each do |operating_system| - @software_info.operating_systems << operating_system - end - end - - valid_libraries = @list_libraries.empty? || LibraryHelper.valid_list_libraries?(@list_libraries) - valid_database = DatabaseHelper.valid_list_database?(@list_databases) - valid_language = SoftwareLanguageHelper.valid_list_language?(@list_languages) - valid_operating_system = OperatingSystemHelper.valid_list_operating_system?(@list_operating_systems) - valid_software_categories = request.post? && @software_categories.valid? + @list_libraries = LibraryHelper.list_libraries(params[:library]) + @list_languages = SoftwareLanguageHelper.list_language(params[:language]) + @list_databases = DatabaseHelper.list_database(params[:database]) + @software_categories = SoftwareCategories::new params[:software_categories] + @list_operating_systems = OperatingSystemHelper.list_operating_system(params[:operating_system]) + + + if not @list_libraries.nil? + @list_libraries.each do |library| + @software_info.libraries << library + end + end + + if not @list_languages.nil? + @list_languages.each do |language| + @software_info.software_languages << language + end + end + + if not @list_databases.nil? + @list_databases.each do |database| + @software_info.software_databases << database + end + end + + if not @list_operating_systems.nil? + @list_operating_systems.each do |operating_system| + @software_info.operating_systems << operating_system + end + end + + valid_libraries = @list_libraries.empty? || LibraryHelper.valid_list_libraries?(@list_libraries) + valid_database = DatabaseHelper.valid_list_database?(@list_databases) + valid_language = SoftwareLanguageHelper.valid_list_language?(@list_languages) + valid_operating_system = OperatingSystemHelper.valid_list_operating_system?(@list_operating_systems) + valid_software_categories = request.post? && @software_categories.valid? + + if request.post? + #@software_info.update_attributes(params[:software]) + #@software_info.save! + end end -end -end +end \ No newline at end of file diff --git a/views/mpog_software_plugin_myprofile/_main_software_editor_extras.html.erb b/views/mpog_software_plugin_myprofile/_main_software_editor_extras.html.erb index f27f3b5..e068a5d 100644 --- a/views/mpog_software_plugin_myprofile/_main_software_editor_extras.html.erb +++ b/views/mpog_software_plugin_myprofile/_main_software_editor_extras.html.erb @@ -8,8 +8,8 @@

<%= _("Finality") %>

-
- <%= text_field_tag(:finality, @profile.software_info.finality) %> +
+ <%= text_field_tag("software[finality]", @profile.software_info.finality) %>

<%= _("Licenses") %>

diff --git a/views/mpog_software_plugin_myprofile/edit_software.html.erb b/views/mpog_software_plugin_myprofile/edit_software.html.erb index 1c8ab4c..515aae0 100644 --- a/views/mpog_software_plugin_myprofile/edit_software.html.erb +++ b/views/mpog_software_plugin_myprofile/edit_software.html.erb @@ -1,5 +1,7 @@ <% tabs = [] %> +<%= labelled_form_for :mpog_software_plugin_myprofile, :html => { :multipart => true, :id => 'edit-form' } do |f| %> + <% tabs << {:title => _("Basic"), :id => 'basic-info', :content => (render :partial => 'main_software_editor_extras')} %> @@ -7,3 +9,6 @@ :content => (render :partial => 'public_software_info')} %> <%= render_tabs(tabs) %> + +<%= submit_button(:save, _('Save')) %> +<% end %> \ No newline at end of file -- libgit2 0.21.2