Download as
Browse Code »

Commit 86284f8d58fe49daaf2ac36eeb54e36bb1153cbb

Authored by Daniela Feitosa
Committed by Antonio Terceiro
1 parent ca285e1e
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

added route to invite friends 

(ActionItem1640)
Showing 4 changed files with 9 additions and 3 deletions   Show diff stats
app/views/profile/members.rhtml
  Diff comments   View file @86284f8
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 <% button_bar do %> 17 <% button_bar do %>
18 <%= button :back, _('Go back'), { :controller => 'profile' } %> 18 <%= button :back, _('Go back'), { :controller => 'profile' } %>
19 <% if profile.community? and user and user.has_permission?(:invite_members, profile) %> 19 <% if profile.community? and user and user.has_permission?(:invite_members, profile) %>
20 - <%= button :search, _('Invite your friends to join %s') % profile.name, :controller => 'invite', :action => 'selects_address_book' %> 20 + <%= button :search, _('Invite your friends to join %s') % profile.name, :controller => 'invite', :action => 'select_address_book' %>
21 <% end %> 21 <% end %>
22 <% end %> 22 <% end %>
23 23
config/routes.rb
  Diff comments   View file @86284f8
@@ -65,6 +65,7 @@ ActionController::Routing::Routes.draw do |map| @@ -65,6 +65,7 @@ ActionController::Routing::Routes.draw do |map|
65 map.catalog 'catalog/:profile', :controller => 'catalog', :action => 'index', :profile => /#{Noosfero.identifier_format}/ 65 map.catalog 'catalog/:profile', :controller => 'catalog', :action => 'index', :profile => /#{Noosfero.identifier_format}/
66 66
67 # invite 67 # invite
  68 + map.invite 'profile/:profile/invite/friends', :controller => 'invite', :action => 'select_address_book', :profile => /#{Noosfero.identifier_format}/
68 map.invite 'profile/:profile/invite/:action', :controller => 'invite', :profile => /#{Noosfero.identifier_format}/ 69 map.invite 'profile/:profile/invite/:action', :controller => 'invite', :profile => /#{Noosfero.identifier_format}/
69 70
70 # feeds per tag 71 # feeds per tag
script/production
  Diff comments   View file @86284f8
@@ -20,14 +20,14 @@ do_start() { @@ -20,14 +20,14 @@ do_start() {
20 clear_cache 20 clear_cache
21 ./script/ferret_server -e $RAILS_ENV start 21 ./script/ferret_server -e $RAILS_ENV start
22 ./script/feed-updater start 22 ./script/feed-updater start
23 -# ./script/delayed_job start -n 4 23 + ./script/delayed_job start -n 4
24 mongrel_rails cluster::start 24 mongrel_rails cluster::start
25 } 25 }
26 26
27 do_stop() { 27 do_stop() {
28 mongrel_rails cluster::stop 28 mongrel_rails cluster::stop
29 ./script/delayed_job stop 29 ./script/delayed_job stop
30 -# ./script/feed-updater stop 30 + ./script/feed-updater stop
31 ./script/ferret_server -e $RAILS_ENV stop 31 ./script/ferret_server -e $RAILS_ENV stop
32 } 32 }
33 33
test/integration/routing_test.rb
  Diff comments   View file @86284f8
@@ -219,4 +219,9 @@ class RoutingTest &lt; ActionController::IntegrationTest @@ -219,4 +219,9 @@ class RoutingTest &lt; ActionController::IntegrationTest
219 assert_routing('/browse/communities', :controller => 'browse', :action => 'communities') 219 assert_routing('/browse/communities', :controller => 'browse', :action => 'communities')
220 assert_routing('/browse/communities/more_active', :controller => 'browse', :action => 'communities', :filter => 'more_active') 220 assert_routing('/browse/communities/more_active', :controller => 'browse', :action => 'communities', :filter => 'more_active')
221 end 221 end
  222 +
  223 + def test_invite_routing
  224 + assert_routing('/profile/colivre/invite/friends', :controller => 'invite', :action => 'select_address_book', :profile => 'colivre')
  225 + end
  226 +
222 end 227 end