@@ -1,2 +1,4 @@
load 'deploy' if respond_to?(:namespace) # cap2 differentiator
-load 'config/deploy'
\ No newline at end of file
+Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
+
+load 'config/deploy' # remove this line to skip loading any of the default tasks
\ No newline at end of file
Capfile
@@ -19,7 +19,7 @@ class ImportsController < ApplicationController
if @unsuccessful > 0
flash[:warning] = "Failed to import #{@unsuccessful} #{@unsuccessful > 1 ? 'people' : 'person'}"
end
- format.html { redirect_to(directory_people_path) }
+ format.html { redirect_to(directory_people_path(:format => :html)) }
format.xml { render :xml => @import, :status => :created, :location => @import }
else
flash[:warning] = 'Import failed. Check to make sure you header column names match the names on the right exactly.'
app/controllers/imports_controller.rb
@@ -494,10 +494,10 @@ class PeopleController < ApplicationController
@ministry = nil; get_ministry # reset the active ministry
respond_to do |wants|
- wants.html { redirect_to(directory_people_path(:campus => params[:campus])) }
+ wants.html { redirect_to(directory_people_path(:campus => params[:campus], :format => :html)) }
wants.js do
render :update do |page|
- page.redirect_to(directory_people_path(:campus => params[:campus]))
+ page.redirect_to(directory_people_path(:campus => params[:campus], :format => :html))
end
end
end
@@ -510,10 +510,10 @@ class PeopleController < ApplicationController
# Clear session[:order] since this view might not have the same columns
session[:order_column_id] = nil
respond_to do |wants|
- wants.html { redirect_to(directory_people_path) }
+ wants.html { redirect_to(directory_people_path(:format => :html)) }
wants.js do
render :update do |page|
- page.redirect_to(directory_people_path)
+ page.redirect_to(directory_people_path(:format => :html))
end
end
end
app/controllers/people_controller.rb
@@ -93,7 +93,7 @@ this system, along with any other information we think would be helpful to you.<
<div class="modulecontent">
<div class="modulesearchbox">
- <% form_tag(directory_people_path) do %>
+ <% form_tag(directory_people_path(:format => :html)) do %>
<input type="text" class="searchdash" name="search" />
<input type="submit" class="searchdashsubmit" value="Search"/><br />
<%- end -%>
@@ -106,7 +106,7 @@ this system, along with any other information we think would be helpful to you.<
<div class="lightgray">
<ul class="searchicon">
<% @my.searches.each do |search| %>
- <li><%= link_to(search.description, directory_people_path(:search_id => search.id)) %></li>
+ <li><%= link_to(search.description, directory_people_path(:search_id => search.id, :format => :html)) %></li>
<% end %>
</ul>
</div>
@@ -150,7 +150,7 @@ this system, along with any other information we think would be helpful to you.<
<li><%= link_to('Create a ministry', '/manage') %></li>
<%- end -%>
<%- if authorized?(:directory, :people) -%>
- <li><%= link_to('Go to the directory', directory_people_path) %></li>
+ <li><%= link_to('Go to the directory', directory_people_path(:format => :html)) %></li>
<%- end -%>
</ul>
</div>
app/views/dashboard/index.html.erb
@@ -77,8 +77,8 @@
<table width="100%">
<tr>
<td width="18%">
- <%= image_tag("logo.png") %></td><td style="font-size:11px;"> <!-- <a href="">Help</a>   <br> -->
- Student Network is part of the <a href="http://www.ministryhacks.com/">MinistryHacks Toolbox</a>
+ <!-- <%= image_tag("logo.png") %></td><td style="font-size:11px;">
+ Student Network is part of the <a href="http://www.ministryhacks.com/">MinistryHacks Toolbox</a> -->
</td>
<td align="right">
<a href="http://www.ministryhacks.com/" target="_new"><%= image_tag("mh_logo.png") %></a>
app/views/layouts/application.html.erb
@@ -12,7 +12,7 @@
:confirm => "Are you sure you want to delete this campus?\nOnce you do, it'll be gone, along with all the people on it.\n YOU'VE BEEN WARNED!" %>
<%- end -%>
<%- if @ministry == ministry_campus.ministry -%>
- <%= link_to(h(campus.name), directory_people_path(:current_ministry => ministry_campus.ministry_id, :campus => campus.id), :method => :get) %>
+ <%= link_to(h(campus.name), directory_people_path(:current_ministry => ministry_campus.ministry_id, :campus => campus.id, :format => :html), :method => :get) %>
<%- elsif @my.ministries.include?(ministry_campus.ministry) -%>
<%= link_to(h(campus.name), change_ministry_and_goto_directory_people_path(:current_ministry => ministry_campus.ministry_id, :campus => campus.id), :method => :get) %>
<%- else -%>
app/views/ministry_campuses/_ministry_campus.html.erb
@@ -7,7 +7,7 @@
:confirm => "Are you sure you want to remove #{@person.first_name} from #{ci.campus.name}?",
:method => :delete,
:before => "$('#spinner').show()") if is_ministry_leader || @person == @me %>
- <%= link_to(ci.campus.short_name, directory_people_url(:campus => ci.campus.id)) %>
+ <%= link_to(ci.campus.short_name, directory_people_url(:campus => ci.campus.id, :format => :html)) %>
</li>
<%- end
end-%>
app/views/people/_campuses.html.erb
@@ -73,10 +73,10 @@
<!-- | -->
<%- ('A'..'Z').each do |l| -%>
<!-- <%#= link_to l+'-'+l+'m', directory_people_url(:start => l, :finish => l+'n', :search_id => @search.id) %> | -->
- <% options << [l+'-'+l+'m', directory_people_url(:start => l, :finish => l+'n', :search_id => @search.id)] %>
+ <% options << [l+'-'+l+'m', directory_people_url(:start => l, :finish => l+'n', :search_id => @search.id, :format => :html)] %>
<%- finish = (l == 'Z') ? '' : l.next -%>
<!-- <%#= link_to l+'n-'+l+'z', directory_people_url(:start => l+'n', :finish => finish, :search_id => @search.id) %> | -->
- <% options << [l+'n-'+l+'z', directory_people_url(:start => l+'n', :finish => finish, :search_id => @search.id)] %>
+ <% options << [l+'n-'+l+'z', directory_people_url(:start => l+'n', :finish => finish, :search_id => @search.id, :format => :html)] %>
<%- end -%>
<%- elsif @count > 500
# set the default start value to A
@@ -85,7 +85,7 @@
<%- ('A'..'Z').each do |l|
finish = (l == 'Z') ? '' : l.next -%>
<!-- <%#= link_to l, directory_people_url(:start => l, :finish => finish, :search_id => @search.id) %> | -->
- <% options << [l+'-'+finish, directory_people_url(:start => l, :finish => finish, :search_id => @search.id)] %>
+ <% options << [l+'-'+finish, directory_people_url(:start => l, :finish => finish, :search_id => @search.id, :format => :html)] %>
<%- end -%>
<%- end -%>
<% if @count > 500 %>
app/views/people/directory.html.erb
@@ -18,7 +18,7 @@ class ImportsControllerTest < ActionController::TestCase
assert assigns(:import)
assert_equal(1, assigns(:successful))
assert_response :redirect
- assert_redirected_to '/people/directory'
+ assert_redirected_to '/people/directory.html'
end
test "create from xls file" do
@@ -27,7 +27,7 @@ class ImportsControllerTest < ActionController::TestCase
assert assigns(:import)
assert_equal(1, assigns(:successful))
assert_response :redirect
- assert_redirected_to '/people/directory'
+ assert_redirected_to '/people/directory.html'
end
test "create with no good rows" do
@@ -46,6 +46,6 @@ class ImportsControllerTest < ActionController::TestCase
assert_equal(1, assigns(:successful))
assert_equal(1, assigns(:unsuccessful))
assert_response :redirect
- assert_redirected_to '/people/directory'
+ assert_redirected_to '/people/directory.html'
end
end
test/functional/imports_controller_test.rb
@@ -88,13 +88,13 @@ class PeopleControllerTest < ActionController::TestCase
test "should change view" do
post :change_view, :view => '1'
- assert_redirected_to directory_people_path
+ assert_redirected_to directory_people_path(:format => :html)
end
test "should clear session order when changing view" do
get :directory, :order => Person._(:first_name)
post :change_view, :view => '1'
- assert_redirected_to directory_people_path
+ assert_redirected_to directory_people_path(:format => :html)
assert_nil session[:order]
end
test/functional/people_controller_test.rb
0901f1877d6dbeb4a338b6f08990e3fe169dadfe
Josh Starcher
josh@josh-starchers-mac-pro.local
http://github.com/twinge/ministry-tracker/commit/8d14df083844b14bfa168a32b20315c9726c2180
8d14df083844b14bfa168a32b20315c9726c2180
2009-09-16T13:44:00-07:00
2009-09-16T13:44:00-07:00
IE needs .html on directory
b591f3d65bd6f66de3f02d061795d7663561b423
Josh Starcher
josh@josh-starchers-mac-pro.local