Download as
Browse Code »

Commit 65f22b96cf6ddeee465033b491a76c40f711fc54

Authored by Joenio Costa
1 parent d74fdaec
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Do not list templates when assigning enterprises to bsc 

- also, fix missing Helper for plugin

(ActionItem2102)
Showing 3 changed files with 14 additions and 1 deletions   Show diff stats
plugins/bsc/controllers/bsc_plugin_myprofile_controller.rb
  Diff comments   View file @65f22b9
@@ -8,7 +8,7 @@ class BscPluginMyprofileController < MyProfileController @@ -8,7 +8,7 @@ class BscPluginMyprofileController < MyProfileController
8 end 8 end
9 9
10 def search_enterprise 10 def search_enterprise
11 - render :text => environment.enterprises.find(:all, :conditions => ["type <> 'BscPlugin::Bsc' AND (LOWER(name) LIKE ? OR LOWER(identifier) LIKE ?)", "%#{params[:q]}%", "%#{params[:q]}%"]). 11 + render :text => environment.enterprises.find(:all, :conditions => ["type <> 'BscPlugin::Bsc' AND (LOWER(name) LIKE ? OR LOWER(identifier) LIKE ?) AND (identifier NOT LIKE ?)", "%#{params[:q]}%", "%#{params[:q]}%", "%_template"]).
12 select { |enterprise| enterprise.bsc.nil? && !profile.already_requested?(enterprise)}. 12 select { |enterprise| enterprise.bsc.nil? && !profile.already_requested?(enterprise)}.
13 map {|enterprise| {:id => enterprise.id, :name => enterprise.name} }. 13 map {|enterprise| {:id => enterprise.id, :name => enterprise.name} }.
14 to_json 14 to_json
plugins/bsc/lib/bsc_plugin/bsc_helper.rb
  Diff comments   View file @65f22b9
1 module BscPlugin::BscHelper 1 module BscPlugin::BscHelper
2 include ActionView::Helpers::FormTagHelper 2 include ActionView::Helpers::FormTagHelper
  3 + include ActionView::Helpers::TextHelper
3 4
4 def token_input_field_tag(name, element_id, search_action, options = {}, text_field_options = {}, html_options = {}) 5 def token_input_field_tag(name, element_id, search_action, options = {}, text_field_options = {}, html_options = {})
5 options[:min_chars] ||= 3 6 options[:min_chars] ||= 3
plugins/bsc/test/functional/bsc_plugin_myprofile_controller_test.rb
  Diff comments   View file @65f22b9
@@ -50,6 +50,18 @@ class BscPluginMyprofileControllerTest &lt; Test::Unit::TestCase @@ -50,6 +50,18 @@ class BscPluginMyprofileControllerTest &lt; Test::Unit::TestCase
50 assert_match /#{e6.name}/, @response.body 50 assert_match /#{e6.name}/, @response.body
51 end 51 end
52 52
  53 + should 'do not list profiles template on search' do
  54 + e1 = Enterprise.create!(:name => 'Sample Enterprise 1', :identifier => 'sample-enterprise-1')
  55 + e2 = Enterprise.create!(:name => 'Sample Enterprise 2', :identifier => 'sample-enterprise-2')
  56 + t1 = Enterprise.create!(:name => 'Enterprise template', :identifier => 'enterprise_template')
  57 + t2 = Enterprise.create!(:name => 'Inactive enterprise template', :identifier => 'inactive_enterprise_template')
  58 +
  59 + get :search_enterprise, :profile => bsc.identifier, :q => 'ent'
  60 +
  61 + assert_no_match /#{t1.name}/, @response.body
  62 + assert_no_match /#{t2.name}/, @response.body
  63 + end
  64 +
53 should 'save associations' do 65 should 'save associations' do
54 e1 = fast_create(Enterprise, :enabled => false) 66 e1 = fast_create(Enterprise, :enabled => false)
55 e2 = fast_create(Enterprise, :enabled => false) 67 e2 = fast_create(Enterprise, :enabled => false)