From 86284f8d58fe49daaf2ac36eeb54e36bb1153cbb Mon Sep 17 00:00:00 2001 From: Daniela Soares Feitosa Date: Fri, 27 Aug 2010 18:18:59 -0300 Subject: [PATCH] added route to invite friends --- app/views/profile/members.rhtml | 2 +- config/routes.rb | 1 + script/production | 4 ++-- test/integration/routing_test.rb | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/views/profile/members.rhtml b/app/views/profile/members.rhtml index 7a76177..a675ab6 100644 --- a/app/views/profile/members.rhtml +++ b/app/views/profile/members.rhtml @@ -17,7 +17,7 @@ <% button_bar do %> <%= button :back, _('Go back'), { :controller => 'profile' } %> <% if profile.community? and user and user.has_permission?(:invite_members, profile) %> - <%= button :search, _('Invite your friends to join %s') % profile.name, :controller => 'invite', :action => 'selects_address_book' %> + <%= button :search, _('Invite your friends to join %s') % profile.name, :controller => 'invite', :action => 'select_address_book' %> <% end %> <% end %> diff --git a/config/routes.rb b/config/routes.rb index ea89e05..766e507 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -65,6 +65,7 @@ ActionController::Routing::Routes.draw do |map| map.catalog 'catalog/:profile', :controller => 'catalog', :action => 'index', :profile => /#{Noosfero.identifier_format}/ # invite + map.invite 'profile/:profile/invite/friends', :controller => 'invite', :action => 'select_address_book', :profile => /#{Noosfero.identifier_format}/ map.invite 'profile/:profile/invite/:action', :controller => 'invite', :profile => /#{Noosfero.identifier_format}/ # feeds per tag diff --git a/script/production b/script/production index c494804..cdcd6b4 100755 --- a/script/production +++ b/script/production @@ -20,14 +20,14 @@ do_start() { clear_cache ./script/ferret_server -e $RAILS_ENV start ./script/feed-updater start -# ./script/delayed_job start -n 4 + ./script/delayed_job start -n 4 mongrel_rails cluster::start } do_stop() { mongrel_rails cluster::stop ./script/delayed_job stop -# ./script/feed-updater stop + ./script/feed-updater stop ./script/ferret_server -e $RAILS_ENV stop } diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb index 93ea346..59c69f8 100644 --- a/test/integration/routing_test.rb +++ b/test/integration/routing_test.rb @@ -219,4 +219,9 @@ class RoutingTest < ActionController::IntegrationTest assert_routing('/browse/communities', :controller => 'browse', :action => 'communities') assert_routing('/browse/communities/more_active', :controller => 'browse', :action => 'communities', :filter => 'more_active') end + + def test_invite_routing + assert_routing('/profile/colivre/invite/friends', :controller => 'invite', :action => 'select_address_book', :profile => 'colivre') + end + end -- libgit2 0.21.2