From e7eecf9f4afa67e1fe3e1bc6b34f002387c851e4 Mon Sep 17 00:00:00 2001 From: Thiago Ribeiro Date: Mon, 13 Jul 2015 17:03:28 -0300 Subject: [PATCH] Autocomplete for isntitution in software ratings. --- lib/gov_user_plugin.rb | 5 +++++ public/initializer.js | 3 ++- public/views/create-institution.js | 4 ++++ public/views/gov-user-comments-extra-fields.js | 27 +++++++++++++++++++++++++++ views/comments_extra_field.html.erb | 7 +++++++ 5 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 public/views/gov-user-comments-extra-fields.js create mode 100644 views/comments_extra_field.html.erb diff --git a/lib/gov_user_plugin.rb b/lib/gov_user_plugin.rb index fb32bd2..a62470e 100644 --- a/lib/gov_user_plugin.rb +++ b/lib/gov_user_plugin.rb @@ -153,6 +153,7 @@ class GovUserPlugin < Noosfero::Plugin views/create-institution.js views/new-community.js views/user-edit-profile.js + views/gov-user-comments-extra-fields.js initializer.js app.js ) @@ -232,6 +233,10 @@ class GovUserPlugin < Noosfero::Plugin end end + def communities_ratings_plugin_comments_extra_fields + Proc::new do render :file => 'comments_extra_field' end + end + private def call_model_transaction(model,name) diff --git a/public/initializer.js b/public/initializer.js index 2b5ac3d..395f20c 100644 --- a/public/initializer.js +++ b/public/initializer.js @@ -6,7 +6,8 @@ 'CreateInstitution', 'CompleteRegistration', 'UserEditProfile', - 'NewCommunity' + 'NewCommunity', + 'GovUserCommentsExtraFields' ]; diff --git a/public/views/create-institution.js b/public/views/create-institution.js index b78c3ec..5ddfbf7 100644 --- a/public/views/create-institution.js +++ b/public/views/create-institution.js @@ -398,6 +398,10 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement'] init: function() { set_form_count_custom_data(); set_events(); + }, + + institution_autocomplete: function(){ + institution_autocomplete(); } } }); diff --git a/public/views/gov-user-comments-extra-fields.js b/public/views/gov-user-comments-extra-fields.js new file mode 100644 index 0000000..7a5c44c --- /dev/null +++ b/public/views/gov-user-comments-extra-fields.js @@ -0,0 +1,27 @@ +modulejs.define("GovUserCommentsExtraFields", ['jquery','CreateInstitution'], function($,CreateInstitution) { + + function set_events() { + CreateInstitution.institution_autocomplete(); + } + + + function prepend_to_aditional_information() { + var aditional_information = $(".comments-software-extra-fields"); + var institution_comments = $("#input_institution_comments"); + + aditional_information.prepend(institution_comments.remove()); + } + + + return { + isCurrentPage: function() { + return $(".star-rate-form").length === 1; + }, + + init: function() { + prepend_to_aditional_information(); + set_events(); + } + } + +}) diff --git a/views/comments_extra_field.html.erb b/views/comments_extra_field.html.erb new file mode 100644 index 0000000..adeed44 --- /dev/null +++ b/views/comments_extra_field.html.erb @@ -0,0 +1,7 @@ +
+ <%= label_tag "input_institution", _("Organiztion name or Enterprise name")%> + <%= text_field_tag "comments[instituton_name]", "", id: "input_institution" %> + <%= content_tag(:div, _("No institution found"), + :id=>"institution_empty_ajax_message", + :class=>"errorExplanation hide-field") %> +
-- libgit2 0.21.2