Emergency diff to make sure everything is safe. No major changes.

git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@16 a4c988fc-2ded-0310-b66e-134b36920a42

tracks/app/controllers/context_controller.rb

@@ -5,7 +5,7 @@ class ContextController < ApplicationController
   model :project
   scaffold :context
   before_filter :login_required
-  caches_action :list, :show
+  # caches_action :list, :show
   
   layout "standard"
   

tracks/app/controllers/project_controller.rb

@@ -6,7 +6,7 @@ class ProjectController < ApplicationController
   scaffold :project
   
   before_filter :login_required
-  caches_action :list, :show
+  # caches_action :list, :show
   layout "standard"
   
   # Main method for listing projects

tracks/app/controllers/todo_controller.rb

@@ -4,7 +4,7 @@ class TodoController < ApplicationController
   model :context, :project
   
 	before_filter :login_required
-	caches_action :list, :completed
+	# caches_action :list, :completed
   layout "standard"
     
 	# Main method for listing tasks
@@ -13,7 +13,8 @@ class TodoController < ApplicationController
 	def list
 		@page_title = "List tasks"
 		@projects = Project.find_all
-    @places = Context.find_all( "hide=0", "id ASC")
+		@places = Context.find_all
+	  @shown_places = Context.find_all( "hide=0", "id ASC")
     @hidden_places = Context.find_all( "hide=1")
 		@done = Todo.find_all( "done=1", "completed DESC", 5 )
 		@count = Todo.count( "done=0" )
@@ -58,9 +59,9 @@ class TodoController < ApplicationController
 	def edit
     @item = Todo.find(@params['id'])
     @belongs = @item.project_id
+		@projects = Project.find_all
+		@places = Context.find_all
     @page_title = "Edit task: #{@item.description}"
-    @places = Context.find_all
-    @projects = Project.find_all
   end
 
 

tracks/app/views/todo/list.rhtml

@@ -1,9 +1,9 @@
 <div id="display_box">
-<% for @place in @places %>
+<% for @shown_place in @shown_places %>
-  <% @not_done = Todo.find_all( "done=0 AND context_id=#{@place.id}", "created ASC" ) %>
+  <% @not_done = Todo.find_all( "done=0 AND context_id=#{@shown_place.id}", "created ASC" ) %>
 	<% if !@not_done.empty? %>
 	<div class="contexts">
-    <h2><%= link_to( "#{@place.name.capitalize}", :controller => "context", :action => "show", :id => @place.id )  %></h2>
+    <h2><%= link_to( "#{@shown_place.name.capitalize}", :controller => "context", :action => "show", :id => @shown_place.id )  %></h2>
 	  <table class="next_actions" id="incomplete" cellspacing="2" cellpadding="0" border="0">
 	    <%= render_collection_of_partials "not_done", @not_done %>
 	  </table>

tracks/config/environments/development.rb

@@ -2,4 +2,4 @@ Dependencies.mechanism                             = :load
 ActionController::Base.consider_all_requests_local = true
 BREAKPOINT_SERVER_PORT = 42531
 
-ActionController::Base.fragment_cache_store = ActionController::Caching::Fragments::FileStore.new("localhost")
+ActionController::Base.fragment_cache_store = ActionController::Caching::Fragments::FileStore.new("/Users/jchappell/Sites/tracks/cache")

tracks/config/environments/production.rb

@@ -1,5 +1,5 @@
 Dependencies.mechanism                             = :require
 ActionController::Base.consider_all_requests_local = false
 
-ActionController::Base.fragment_cache_store = ActionController::Caching::Fragments::FileStore.new("localhost")
+ActionController::Base.fragment_cache_store = ActionController::Caching::Fragments::FileStore.new("/Users/jchappell/Sites/tracks/cache")
 

tracks/public/.htaccess

@@ -7,7 +7,7 @@ Options +FollowSymLinks +ExecCGI
 RewriteEngine On
 
 # Change extension from .cgi to .fcgi to switch to FCGI and to .rb to switch to mod_ruby
-RewriteBase /dispatch.cgi
+RewriteBase /dispatch.fcgi
 
 # Enable this rewrite rule to point to the controller/action that should serve root.
 # RewriteRule ^$ /controller/action [R]