Download as
Browse Code »

Commit 779e07dc26df167d7cf6dcbd6cf46f652009fd19

Authored by Gust
Committed by Fabio Teixeira
1 parent dd140267
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 registration and edit pages 

-Using the minimal fields: name, finality and license info

Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Showing 2 changed files with 12 additions and 12 deletions   Show diff stats
controllers/mpog_software_plugin_myprofile_controller.rb
  Diff comments   View file @779e07d
@@ -51,15 +51,15 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController @@ -51,15 +51,15 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
51 51
52 valid_community = request.post? && @community.valid? 52 valid_community = request.post? && @community.valid?
53 valid_software_info = request.post? && @software_info.valid? 53 valid_software_info = request.post? && @software_info.valid?
54 - #valid_license = (request.post? && @license_info.valid?) 54 + valid_license = (request.post? && @license_info.valid?)
55 #valid_libraries = @list_libraries.empty? || LibraryHelper.valid_list_libraries?(@list_libraries) 55 #valid_libraries = @list_libraries.empty? || LibraryHelper.valid_list_libraries?(@list_libraries)
56 #valid_database = DatabaseHelper.valid_list_database?(@list_databases) 56 #valid_database = DatabaseHelper.valid_list_database?(@list_databases)
57 #valid_language = SoftwareLanguageHelper.valid_list_language?(@list_languages) 57 #valid_language = SoftwareLanguageHelper.valid_list_language?(@list_languages)
58 #valid_operating_system = OperatingSystemHelper.valid_list_operating_system?(@list_operating_systems) 58 #valid_operating_system = OperatingSystemHelper.valid_list_operating_system?(@list_operating_systems)
59 #valid_software_categories = request.post? && @software_categories.valid? 59 #valid_software_categories = request.post? && @software_categories.valid?
60 60
61 - if valid_software_info && valid_community  
62 - @community = Community.create_after_moderation(user, {:environment => environment}.merge(params[:community]), @software_info ) 61 + if valid_software_info && valid_license && valid_community
  62 + @community = Community.create_after_moderation(user, {:environment => environment}.merge(params[:community]), @software_info, @license_info )
63 redirect_to :controller => 'memberships', :action => 'index' 63 redirect_to :controller => 'memberships', :action => 'index'
64 64
65 unless params[:q].nil? 65 unless params[:q].nil?
lib/software_info.rb
  Diff comments   View file @779e07d
@@ -2,18 +2,18 @@ class SoftwareInfo &lt; ActiveRecord::Base @@ -2,18 +2,18 @@ class SoftwareInfo &lt; ActiveRecord::Base
2 # attr_accessible :e_mag, :icp_brasil, :intern, :e_ping, :e_arq, :operating_platform, :demonstration_url, :acronym, :objectives, :features, :license_infos_id, :community_id, :finality 2 # attr_accessible :e_mag, :icp_brasil, :intern, :e_ping, :e_arq, :operating_platform, :demonstration_url, :acronym, :objectives, :features, :license_infos_id, :community_id, :finality
3 attr_accessible :finality 3 attr_accessible :finality
4 4
5 - #has_many :libraries, :dependent => :destroy  
6 - #has_many :software_databases  
7 - #has_many :database_descriptions, :through => :software_databases  
8 - #has_many :software_languages  
9 - #has_many :operating_systems  
10 - #has_many :programming_languages, :through => :software_languages  
11 - #has_many :operating_system_names, :through => :operating_systems 5 + has_many :libraries, :dependent => :destroy
  6 + has_many :software_databases
  7 + has_many :database_descriptions, :through => :software_databases
  8 + has_many :software_languages
  9 + has_many :operating_systems
  10 + has_many :programming_languages, :through => :software_languages
  11 + has_many :operating_system_names, :through => :operating_systems
12 12
13 belongs_to :community 13 belongs_to :community
14 - #belongs_to :license_info 14 + belongs_to :license_info
15 15
16 - #has_one :software_categories 16 + has_one :software_categories
17 17
18 #validates :features, :objectives, 18 #validates :features, :objectives,
19 # :presence=>true, 19 # :presence=>true,