From 3b8b5180b6efeb06cf4ca2391c640256d403d9b4 Mon Sep 17 00:00:00 2001 From: Luciano Prestes Cavalcanti Date: Tue, 24 Nov 2015 20:23:41 +0100 Subject: [PATCH] software-communities: refactoring namespaces --- src/noosfero-spb/software_communities/controllers/software_communities_plugin_controller.rb | 8 ++++---- src/noosfero-spb/software_communities/controllers/software_communities_plugin_myprofile_controller.rb | 22 +++++++++++----------- src/noosfero-spb/software_communities/controllers/software_communities_plugin_profile_controller.rb | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/noosfero-spb/software_communities/controllers/software_communities_plugin_controller.rb b/src/noosfero-spb/software_communities/controllers/software_communities_plugin_controller.rb index 0d59ad8..14d2c73 100644 --- a/src/noosfero-spb/software_communities/controllers/software_communities_plugin_controller.rb +++ b/src/noosfero-spb/software_communities/controllers/software_communities_plugin_controller.rb @@ -5,8 +5,8 @@ class SoftwareCommunitiesPluginController < ApplicationController def get_license_data return render :json=>{} if !request.xhr? || params[:query].nil? - data = LicenseHelper.find_licenses(params[:query]) if params[:query] - data ||= LicenseInfo.all + data = SoftwareCommunitiesPlugin::LicenseHelper.find_licenses(params[:query]) if params[:query] + data ||= SoftwareCommunitiesPlugin::LicenseInfo.all render :json=> data.collect { |license| {:id=>license.id, :label=>license.version} @@ -42,7 +42,7 @@ class SoftwareCommunitiesPluginController < ApplicationController protected def get_model_by_params_field - return DatabaseDescription unless params[:field] == "software_language" - return ProgrammingLanguage + return SoftwareCommunitiesPlugin::DatabaseDescription unless params[:field] == "software_language" + return SoftwareCommunitiesPlugin::ProgrammingLanguage end end diff --git a/src/noosfero-spb/software_communities/controllers/software_communities_plugin_myprofile_controller.rb b/src/noosfero-spb/software_communities/controllers/software_communities_plugin_myprofile_controller.rb index f51b5ff..68cb086 100644 --- a/src/noosfero-spb/software_communities/controllers/software_communities_plugin_myprofile_controller.rb +++ b/src/noosfero-spb/software_communities/controllers/software_communities_plugin_myprofile_controller.rb @@ -10,10 +10,10 @@ class SoftwareCommunitiesPluginMyprofileController < MyProfileController @community = Community.new(params[:community]) @community.environment = environment - @license_info = LicenseInfo.find_by_id(params[:license][:license_infos_id]) if params[:license] - @license_info ||= LicenseInfo.new + @license_info = SoftwareCommunitiesPlugin::LicenseInfo.find_by_id(params[:license][:license_infos_id]) if params[:license] + @license_info ||= SoftwareCommunitiesPlugin::LicenseInfo.new - @software_info = SoftwareInfo.new(params[:software_info]) + @software_info = SoftwareCommunitiesPlugin::SoftwareInfo.new(params[:software_info]) @software_info.community = @community @software_info.license_info = @license_info @@ -90,7 +90,7 @@ class SoftwareCommunitiesPluginMyprofileController < MyProfileController def create_software @software_info = @profile.software_info params[:software][:public_software] ||= false unless @software_info.public_software? - @license = LicenseInfo.find(params[:license][:license_infos_id]) + @license = SoftwareCommunitiesPlugin::LicenseInfo.find(params[:license][:license_infos_id]) @software_info.license_info = @license @software_info.update_attributes(params[:software]) @@ -109,10 +109,10 @@ class SoftwareCommunitiesPluginMyprofileController < MyProfileController end def create_list_model_helpers - @list_libraries = LibraryHelper.list_library(params[:library]) - @list_languages = SoftwareLanguageHelper.list_language(params[:language]) - @list_databases = DatabaseHelper.list_database(params[:database]) - @list_operating_systems = OperatingSystemHelper.list_operating_system(params[:operating_system]) + @list_libraries = SoftwareCommunitiesPlugin::LibraryHelper.list_library(params[:library]) + @list_languages = SoftwareCommunitiesPlugin::SoftwareLanguageHelper.list_language(params[:language]) + @list_databases = SoftwareCommunitiesPlugin::DatabaseHelper.list_database(params[:database]) + @list_operating_systems = SoftwareCommunitiesPlugin::OperatingSystemHelper.list_operating_system(params[:operating_system]) end def send_software_to_moderation @@ -122,7 +122,7 @@ class SoftwareCommunitiesPluginMyprofileController < MyProfileController another_license_version = params[:license][:version] another_license_link = params[:license][:link] end - @software_info = SoftwareInfo.create_after_moderation(user, + @software_info = SoftwareCommunitiesPlugin::SoftwareInfo.create_after_moderation(user, params[:software_info].merge({ :environment => environment, :name => params[:community][:name], @@ -158,7 +158,7 @@ class SoftwareCommunitiesPluginMyprofileController < MyProfileController @another_license_version = "" @another_license_link = "" - license_another = LicenseInfo.find_by_version("Another") + license_another = SoftwareCommunitiesPlugin::LicenseInfo.find_by_version("Another") if license_another && @software_info.license_info_id == license_another.id @license_version = "Another" @another_license_version = @software_info.license_info.version @@ -167,7 +167,7 @@ class SoftwareCommunitiesPluginMyprofileController < MyProfileController end def set_software_as_template - software_template = SoftwareHelper.software_template + software_template = SoftwareCommunitiesPlugin::SoftwareHelper.software_template software_valid = !software_template.blank? && !params['community'].blank? if software_valid params['community']['template_id'] = software_template.id if software_valid diff --git a/src/noosfero-spb/software_communities/controllers/software_communities_plugin_profile_controller.rb b/src/noosfero-spb/software_communities/controllers/software_communities_plugin_profile_controller.rb index 9f80e73..b76db27 100644 --- a/src/noosfero-spb/software_communities/controllers/software_communities_plugin_profile_controller.rb +++ b/src/noosfero-spb/software_communities/controllers/software_communities_plugin_profile_controller.rb @@ -9,11 +9,11 @@ class SoftwareCommunitiesPluginProfileController < ProfileController } def download_file - download_block = DownloadBlock.find_by_id params[:block] + download_block = SoftwareCommunitiesPlugin::DownloadBlock.find_by_id params[:block] index = params[:download_index].to_i if download_block and (index < download_block.downloads.size) - download = Download.new(download_block.downloads[index]) + download = SoftwareCommunitiesPlugin::Download.new(download_block.downloads[index]) download.total_downloads += 1 download_block.downloads[index] = download.to_hash -- libgit2 0.21.2