Download as
Browse Code »

Commit f123bb04dd6c4231f28d2a0d00ee768d39396e2b

Authored by Rodrigo Souto
1 parent 8b4f7289
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

[stoa] Blocking access to invite friends if user doesn't have usp id 

  * Adding new hotspots to remove links of invite friends
  * Adding new link on the control panel to invite friend
Showing 8 changed files with 92 additions and 2 deletions   Show diff stats
app/views/friends/index.rhtml
  Diff comments   View file @f123bb0
... ... @@ -14,7 +14,9 @@
14 14 <% button_bar do %>
15 15 <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
16 16 <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
17   - <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
  17 + <% if !@plugins.dispatch(:remove_invite_friends_button).include?(true) %>
  18 + <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
  19 + <% end %>
18 20 <% end %>
19 21 <% end %>
20 22  
... ... @@ -43,7 +45,9 @@
43 45 <% button_bar do %>
44 46 <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
45 47 <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
46   - <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
  48 + <% if !@plugins.dispatch(:remove_invite_friends_button).include?(true) %>
  49 + <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
  50 + <% end %>
47 51 <% end %>
48 52 <% end %>
49 53  
... ...
lib/noosfero/plugin.rb
  Diff comments   View file @f123bb0
... ... @@ -244,4 +244,10 @@ class Noosfero::Plugin
244 244 nil
245 245 end
246 246  
  247 + # -> Removes the invite friend button from the friends controller
  248 + # returns = boolean
  249 + def remove_invite_friends_button
  250 + nil
  251 + end
  252 +
247 253 end
... ...
plugins/stoa/lib/stoa_plugin.rb
  Diff comments   View file @f123bb0
... ... @@ -64,4 +64,21 @@ class StoaPlugin &lt; Noosfero::Plugin
64 64 :block => block }]
65 65 end
66 66  
  67 + def invite_controller_filters
  68 + [{ :type => 'before_filter',
  69 + :method_name => 'check_usp_id_existence',
  70 + :block => lambda {render_access_denied if profile.usp_id.blank?} }]
  71 + end
  72 +
  73 + def control_panel_buttons
  74 + { :title => _('Invite friends'),
  75 + :icon => 'invite-friends',
  76 + :url => {:controller => 'invite',
  77 + :action => 'select_address_book'} } if !context.profile.usp_id.blank?
  78 + end
  79 +
  80 + def remove_invite_friends_button
  81 + true
  82 + end
  83 +
67 84 end
... ...
plugins/stoa/public/images/control-panel/invite-friends.gif 0 → 100644
View file @f123bb0

1.97 KB
plugins/stoa/public/images/control-panel/invite-friends.png 0 → 100644
View file @f123bb0

3.66 KB
plugins/stoa/public/style.css
  Diff comments   View file @f123bb0
... ... @@ -3,3 +3,6 @@
3 3 display: block;
4 4 }
5 5  
  6 +.controller-profile_editor a.control-panel-invite-friends {background-image: url(../stoa/images/control-panel/invite-friends.png)}
  7 +.controller-profile_editor .msie6 a.control-panel-invite-friends {background-image: url(../stoa/images/control-panel/invite-friends.gif)}
  8 +
... ...
plugins/stoa/test/functional/invite_controller_test.rb 0 → 100644
  Diff comments   View file @f123bb0
... ... @@ -0,0 +1,40 @@
  1 +require File.dirname(__FILE__) + '/../../../../test/test_helper'
  2 +require File.dirname(__FILE__) + '/../../../../app/controllers/public/invite_controller'
  3 +
  4 +# Re-raise errors caught by the controller.
  5 +class InviteController; def rescue_action(e) raise e end; end
  6 +
  7 +class InviteControllerTest < ActionController::TestCase
  8 +
  9 + def setup
  10 + @controller = InviteController.new
  11 + @request = ActionController::TestRequest.new
  12 + @response = ActionController::TestResponse.new
  13 + environment = Environment.default
  14 + environment.enabled_plugins = ['StoaPlugin']
  15 + environment.save!
  16 + end
  17 +
  18 + should 'not enable access to invitation if the user has not an usp_id' do
  19 + Task.create!(:code => 12345678)
  20 + person_without_usp_id = User.create!(:login => 'user-without', :email => 'user-without@example.com', :password => 'test', :password_confirmation => 'test', :person_data => {:invitation_code => 12345678}).person
  21 +
  22 + login_as(person_without_usp_id.identifier)
  23 + get :select_address_book, :profile => person_without_usp_id.identifier
  24 + assert_response 403
  25 + get :select_friends, :profile => person_without_usp_id.identifier
  26 + assert_response 403
  27 + end
  28 +
  29 + should 'enable access to invitation if the user has an usp_id' do
  30 + person_with_usp_id = User.create!(:login => 'user-with', :email => 'user-with@example.com', :password => 'test', :password_confirmation => 'test', :person_data => {:usp_id => 12345678}).person
  31 +
  32 + login_as(person_with_usp_id.identifier)
  33 + get :select_address_book, :profile => person_with_usp_id.identifier
  34 + assert_response 200
  35 + get :select_friends, :profile => person_with_usp_id.identifier, :contact_list => ContactList.create.id
  36 + assert_response 200
  37 + end
  38 +
  39 +end
  40 +
... ...
test/functional/friends_controller_test.rb
  Diff comments   View file @f123bb0
... ... @@ -57,4 +57,24 @@ class FriendsControllerTest &lt; ActionController::TestCase
57 57 assert_tag :tag => 'a', :content => 'Find people', :attributes => { :href => '/assets/people' }
58 58 end
59 59  
  60 + should 'not display invite friends button if any plugin tells not to' do
  61 + class Plugin1 < Noosfero::Plugin
  62 + def remove_invite_friends_button
  63 + true
  64 + end
  65 + end
  66 + class Plugin2 < Noosfero::Plugin
  67 + def remove_invite_friends_button
  68 + false
  69 + end
  70 + end
  71 +
  72 + e = profile.environment
  73 + e.enable_plugin(Plugin1.name)
  74 + e.enable_plugin(Plugin2.name)
  75 +
  76 + get :index, :profile => 'testuser'
  77 + assert_no_tag :tag => 'a', :attributes => { :href => "/profile/testuser/invite/friends" }
  78 + end
  79 +
60 80 end
... ...