Download as
Browse Code »

Commit e701524fc72a0527e492a4d261273aa9cbe74185

Authored by Gabriela Navarro
Committed by Fabio Teixeira
1 parent da1dcd8c
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

Redirect to control panel after save on edit.Cancel button 

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Showing 2 changed files with 9 additions and 8 deletions   Show diff stats
controllers/mpog_software_plugin_myprofile_controller.rb
  Diff comments   View file @e701524
... ... @@ -114,13 +114,11 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
114 114 end
115 115 end
116 116  
117   - valid_libraries = @list_libraries.empty? || LibraryHelper.valid_list_libraries?(@list_libraries)
118   - valid_database = DatabaseHelper.valid_list_database?(@list_databases)
119   - valid_language = SoftwareLanguageHelper.valid_list_language?(@list_languages)
120   - valid_operating_system = OperatingSystemHelper.valid_list_operating_system?(@list_operating_systems)
121   - valid_software_categories = request.post? && @software_categories.valid?
122   -
123   - @software_info.save!
  117 + begin
  118 + @software_info.save!
  119 + redirect_to :controller => 'profile_editor', :action => 'index'
  120 + rescue ActiveRecord::RecordInvalid => invalid
  121 + end
124 122 end
125 123 end
126 124  
... ...
views/mpog_software_plugin_myprofile/edit_software.html.erb
  Diff comments   View file @e701524
... ... @@ -10,5 +10,8 @@
10 10  
11 11 <%= render_tabs(tabs) %>
12 12  
13   -<%= submit_button(:save, _('Save')) %>
  13 +<% button_bar do %>
  14 + <%= submit_button(:save, _('Save')) %>
  15 + <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
  16 +<% end %>
14 17 <% end %>
15 18 \ No newline at end of file
... ...