Download as
Browse Code »

Commit 55ae4eb8eac8818390cb57d890de9c2cbb106f51

Authored by Luciano Prestes
1 parent 8b432927
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

Refactory autocomplete javascript and ajax request 

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Showing 2 changed files with 24 additions and 47 deletions   Show diff stats
controllers/mpog_software_plugin_controller.rb
  Diff comments   View file @55ae4eb
... ... @@ -125,29 +125,23 @@ class MpogSoftwarePluginController &lt; ApplicationController
125 125 render :json=>state_list.collect {|state| state.name }.to_json
126 126 end
127 127  
128   - def get_databases
129   - return render :json=>{} unless request.xhr? and params[:query]
130   -
131   - data = DatabaseDescription.where("name ILIKE ?", "%#{params[:query]}%").select("id, name").collect {|db|
132   - {:id=>db.id, :label=>db.name}
133   - }
134   - other = [DatabaseDescription.select("id, name").last].collect { |db|
135   - {:id=>db.id, :label=>db.name}
136   - }
137   -
138   - # Always has other in the list
139   - data |= other
140   -
141   - render :json=> data
142   - end
143   -
144   - def get_languages
145   - return render :json=>{} unless request.xhr? and params[:query]
  128 + def get_field_data
  129 + return render :json=>{} if !request.xhr? or params[:query].nil? or params[:field].nil?
  130 +
  131 + model = nil
  132 + case params[:field]
  133 + when "database"
  134 + model = DatabaseDescription
  135 + when "software_language"
  136 + model = ProgrammingLanguage
  137 + else
  138 + model = DatabaseDescription
  139 + end
146 140  
147   - data = ProgrammingLanguage.where("name ILIKE ?", "%#{params[:query]}%").select("id, name").collect {|db|
  141 + data = model.where("name ILIKE ?", "%#{params[:query]}%").select("id, name").collect {|db|
148 142 {:id=>db.id, :label=>db.name}
149 143 }
150   - other = [ProgrammingLanguage.select("id, name").last].collect { |db|
  144 + other = [model.select("id, name").last].collect { |db|
151 145 {:id=>db.id, :label=>db.name}
152 146 }
153 147  
... ...
public/mpog-software-validations.js
  Diff comments   View file @55ae4eb
... ... @@ -22,38 +22,21 @@
22 22 }
23 23  
24 24 function database_autocomplete() {
25   - jQuery(".database_autocomplete").autocomplete({
26   - source : function(request, response){
27   - jQuery.ajax({
28   - type: "GET",
29   - url: "/plugin/mpog_software/get_databases",
30   - data: {query: request.term},
31   - success: function(result){
32   - response(result);
33   - }
34   - });
35   - },
36   -
37   - minLength: 1,
38   -
39   - select : function (event, selected) {
40   - var description = get_hidden_description_field(this, ".database_description_id");
41   - description.val(selected.item.id);
42   - description.attr("data-label", selected.item.label);
43   - }
44   - }).blur(function(){
45   - verify_autocomplete(this, ".database_description_id");
46   - });
  25 + enable_autocomplete("database", ".database_description_id", ".database_autocomplete");
47 26 }
48 27  
49 28  
50 29 function language_autocomplete() {
51   - jQuery(".language_autocomplete").autocomplete({
  30 + enable_autocomplete("software_language", ".programming_language_id", ".language_autocomplete");
  31 + }
  32 +
  33 + function enable_autocomplete(field_name, field_value_class, autocomplete_class) {
  34 + jQuery(autocomplete_class).autocomplete({
52 35 source : function(request, response){
53 36 jQuery.ajax({
54 37 type: "GET",
55   - url: "/plugin/mpog_software/get_languages",
56   - data: {query: request.term},
  38 + url: "/plugin/mpog_software/get_field_data",
  39 + data: {query: request.term, field: field_name},
57 40 success: function(result){
58 41 response(result);
59 42 }
... ... @@ -63,12 +46,12 @@
63 46 minLength: 0,
64 47  
65 48 select : function (event, selected) {
66   - var description = get_hidden_description_field(this, ".programming_language_id");
  49 + var description = get_hidden_description_field(this, field_value_class);
67 50 description.val(selected.item.id);
68 51 description.attr("data-label", selected.item.label);
69 52 }
70 53 }).blur(function(){
71   - verify_autocomplete(this, ".programming_language_id");
  54 + verify_autocomplete(this, field_value_class);
72 55 });
73 56 }
74 57  
... ...