Commit a30a0489ba01ec7ed0cdec52357ab2bcf6f80c9b

Authored by David Silva
Committed by Arthur Esposte
1 parent 7354ca37
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

Retrive version logic.

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>

Conflicts:
	controllers/software_communities_plugin_controller.rb
controllers/software_communities_plugin_controller.rb
@@ -6,6 +6,61 @@ class SoftwareCommunitiesPluginController &lt; ApplicationController @@ -6,6 +6,61 @@ class SoftwareCommunitiesPluginController &lt; ApplicationController
6 return render :json=>{} if !request.xhr? || params[:query].nil? 6 return render :json=>{} if !request.xhr? || params[:query].nil?
7 7
8 data = if params[:query].empty? 8 data = if params[:query].empty?
  9 + LicenseInfo.all
  10 + else
  11 + LicenseInfo.where("version ILIKE ?", "%#{params[:query]}%").select("id, version")
  12 + end
  13 + render :json=> data.collect { |license|
  14 + {:id=>license.id, :label=>license.version}
  15 + }
  16 +
  17 + end
  18 +
  19 + def download_file
  20 + download_block = Block.find(params[:block_id])
  21 +
  22 + file_link = DownloadFileHelper.get_file_link(download_block, params[:link_index].to_i)
  23 + file = DownloadFileHelper.get_file(file_link)
  24 +
  25 + owner = download_block.owner
  26 + download_software = owner.software_info
  27 + download_software.download_counter += 1
  28 +
  29 + if not file.nil?
  30 + file_body = send_file file.full_filename
  31 +
  32 + self.response.body = Enumerator::new do |enum|
  33 + file_body.each {|file_data| enum << file_data}
  34 +
  35 + # Only save when the download is finished
  36 + download_software.save!
  37 + end
  38 + else
  39 + download_software.save!
  40 +
  41 + # If it is not in noosfero(like a external link),
  42 + # just send the user to this location
  43 + redirect_to file_link
  44 + end
  45 + end
  46 +
  47 + def hide_registration_incomplete_percentage
  48 + response = false
  49 +
  50 + if request.xhr? && params[:hide]
  51 + session[:hide_incomplete_percentage] = true
  52 + response = session[:hide_incomplete_percentage]
  53 + end
  54 +
  55 + render :json=>response.to_json
  56 + end
  57 +
  58 + def create_institution
  59 + @show_sisp_field = environment.admins.include?(current_user.person)
  60 + @state_list = get_state_list()
  61 +>>>>>>> e8d6ff3... Retrive version logic.
  62 +
  63 + data = if params[:query].empty?
9 LicenseInfo.all 64 LicenseInfo.all
10 else 65 else
11 LicenseInfo.where("version ILIKE ?", "%#{params[:query]}%").select("id, version") 66 LicenseInfo.where("version ILIKE ?", "%#{params[:query]}%").select("id, version")