Download as
Browse Code »

Commit f405dad85bff479af1ea6594e23b33aa451166dd

Authored by Parley
1 parent 5dfd5468
Exists in master and in 5 other branches fix_search_by_software_highlight_block, r4, refactor_software_info_365, stable, update_translations

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,7 +28,7 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
28 valid_community = request.post? && @community.valid? 28 valid_community = request.post? && @community.valid?
29 valid_software_info = request.post? && @software_info.valid? 29 valid_software_info = request.post? && @software_info.valid?
30 valid_license = (request.post? && @license_info.valid?) 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 @community = Community.create_after_moderation(user, {:environment => environment}.merge(params[:community]), @software_info, @license_info ) 32 @community = Community.create_after_moderation(user, {:environment => environment}.merge(params[:community]), @software_info, @license_info )
33 33
34 unless params[:q].nil? 34 unless params[:q].nil?
@@ -40,7 +40,12 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController @@ -40,7 +40,12 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
40 end 40 end
41 end 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 else 49 else
45 # @list_libraries.each do |lib| 50 # @list_libraries.each do |lib|
46 # @errors |= lib.errors.full_messages 51 # @errors |= lib.errors.full_messages
@@ -140,4 +145,6 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController @@ -140,4 +145,6 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
140 environment.admins.include?(current_user.person) 145 environment.admins.include?(current_user.person)
141 end 146 end
142 147
  148 + def community_must_be_approved
  149 + end
143 end 150 end