diff --git a/controllers/mpog_software_plugin_myprofile_controller.rb b/controllers/mpog_software_plugin_myprofile_controller.rb index 61365ea..915a3a4 100644 --- a/controllers/mpog_software_plugin_myprofile_controller.rb +++ b/controllers/mpog_software_plugin_myprofile_controller.rb @@ -51,15 +51,15 @@ class MpogSoftwarePluginMyprofileController < MyProfileController valid_community = request.post? && @community.valid? valid_software_info = request.post? && @software_info.valid? - #valid_license = (request.post? && @license_info.valid?) + valid_license = (request.post? && @license_info.valid?) #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 valid_software_info && valid_community - @community = Community.create_after_moderation(user, {:environment => environment}.merge(params[:community]), @software_info ) + if valid_software_info && valid_license && valid_community + @community = Community.create_after_moderation(user, {:environment => environment}.merge(params[:community]), @software_info, @license_info ) redirect_to :controller => 'memberships', :action => 'index' unless params[:q].nil? diff --git a/lib/software_info.rb b/lib/software_info.rb index da14d21..db97901 100644 --- a/lib/software_info.rb +++ b/lib/software_info.rb @@ -2,18 +2,18 @@ class SoftwareInfo < ActiveRecord::Base # attr_accessible :e_mag, :icp_brasil, :intern, :e_ping, :e_arq, :operating_platform, :demonstration_url, :acronym, :objectives, :features, :license_infos_id, :community_id, :finality attr_accessible :finality - #has_many :libraries, :dependent => :destroy - #has_many :software_databases - #has_many :database_descriptions, :through => :software_databases - #has_many :software_languages - #has_many :operating_systems - #has_many :programming_languages, :through => :software_languages - #has_many :operating_system_names, :through => :operating_systems + has_many :libraries, :dependent => :destroy + has_many :software_databases + has_many :database_descriptions, :through => :software_databases + has_many :software_languages + has_many :operating_systems + has_many :programming_languages, :through => :software_languages + has_many :operating_system_names, :through => :operating_systems belongs_to :community - #belongs_to :license_info + belongs_to :license_info - #has_one :software_categories + has_one :software_categories #validates :features, :objectives, # :presence=>true, -- libgit2 0.21.2