Download as
Browse Code »

Commit f405dad85bff479af1ea6594e23b33aa451166dd

Authored by Parley
1 parent 5dfd5468
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

Fix new software creation when communities are moderated. 

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Parley Martins <parley@outlook.com>
Showing 1 changed file with 9 additions and 2 deletions   Show diff stats
controllers/mpog_software_plugin_myprofile_controller.rb
  Diff comments   View file @f405dad
... ... @@ -28,7 +28,7 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
28 28 valid_community = request.post? && @community.valid?
29 29 valid_software_info = request.post? && @software_info.valid?
30 30 valid_license = (request.post? && @license_info.valid?)
31   - if valid_software_info && valid_license && valid_community
  31 + if valid_software_info && valid_license && valid_community
32 32 @community = Community.create_after_moderation(user, {:environment => environment}.merge(params[:community]), @software_info, @license_info )
33 33  
34 34 unless params[:q].nil?
... ... @@ -40,7 +40,12 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
40 40 end
41 41 end
42 42  
43   - redirect_to :controller => 'profile_editor', :action => 'edit', :profile => @community.identifier
  43 + if environment.enabled?("admin_must_approve_new_communities")
  44 + session[:notice] = _('Your new software request will be evaluated by an administrator. You will be notified.')
  45 + redirect_to user.admin_url
  46 + else
  47 + redirect_to :controller => 'profile_editor', :action => 'edit', :profile => @community.identifier
  48 + end
44 49 else
45 50 # @list_libraries.each do |lib|
46 51 # @errors |= lib.errors.full_messages
... ... @@ -140,4 +145,6 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
140 145 environment.admins.include?(current_user.person)
141 146 end
142 147  
  148 + def community_must_be_approved
  149 + end
143 150 end
... ...