diff --git a/controllers/mpog_software_plugin_myprofile_controller.rb b/controllers/mpog_software_plugin_myprofile_controller.rb index c50aae7..dd2f339 100644 --- a/controllers/mpog_software_plugin_myprofile_controller.rb +++ b/controllers/mpog_software_plugin_myprofile_controller.rb @@ -53,7 +53,6 @@ class MpogSoftwarePluginMyprofileController < MyProfileController valid_software_info = request.post? && @software_info.valid? valid_license = (request.post? && @license_info.valid?) if valid_software_info && valid_license && valid_community - @community = Community.create_after_moderation(user, {:environment => environment}.merge(params[:community]), @software_info, @license_info ) @software_info = SoftwareInfo.create_after_moderation(user,params[:software_info].merge({:environment => environment,:name => params[:community][:name]})) unless params[:q].nil? admins = params[:q].split(/,/).map{|n| environment.people.find n.to_i} @@ -63,13 +62,8 @@ class MpogSoftwarePluginMyprofileController < MyProfileController @community.add_admin(admin) end end - - if environment.enabled?("admin_must_approve_new_communities") and !environment.admins.include?(current_user.person) session[:notice] = _('Your new software request will be evaluated by an administrator. You will be notified.') redirect_to user.admin_url - else - redirect_to :controller => 'profile_editor', :action => 'edit', :profile => @community.identifier - end else @errors |= @community.errors.full_messages diff --git a/lib/create_software.rb b/lib/create_software.rb index 1c9e844..854b8c8 100644 --- a/lib/create_software.rb +++ b/lib/create_software.rb @@ -3,12 +3,12 @@ class CreateSoftware < Task validates_presence_of :requestor_id, :target_id validates_presence_of :name - attr_accessible :name, :finality, :repository_link, :requestor, :environment + attr_accessible :name, :finality, :repository_link, :requestor, :environment, :reject_explanation alias :environment :target alias :environment= :target= - DATA_FIELDS = ['name', 'finality', 'license_infos_id', 'repository_link'] + DATA_FIELDS = ['name', 'finality', 'license_info_id', 'repository_link'] DATA_FIELDS.each do |field| settings_items field.to_sym end @@ -19,8 +19,8 @@ class CreateSoftware < Task community.environment = self.environment community.add_admin(self.requestor) - software = SoftwareInfo.create!(:name => self.name, :finality => self.finality, - :repository_link => self.repository_link, :community => community, + software = SoftwareInfo.create!(:finality => self.finality, + :repository_link => self.repository_link, :community_id => community.id, :license_info_id => self.license_info_id) end @@ -82,4 +82,6 @@ class CreateSoftware < Task _('Your request for registering the software "%{software}" was approved. You can access %{environment} now and start using your new software.') % { :software => self.name, :environment => self.environment } end + private + end diff --git a/lib/software_info.rb b/lib/software_info.rb index 99aacd5..1888044 100644 --- a/lib/software_info.rb +++ b/lib/software_info.rb @@ -1,6 +1,6 @@ class SoftwareInfo < ActiveRecord::Base attr_accessible :e_mag, :icp_brasil, :intern, :e_ping, :e_arq, :operating_platform - attr_accessible :demonstration_url, :acronym, :objectives, :features, :license_infos_id + attr_accessible :demonstration_url, :acronym, :objectives, :features, :license_info_id attr_accessible :community_id, :finality, :repository_link, :public_software, :first_edit has_many :libraries, :dependent => :destroy -- libgit2 0.21.2