From f364b039d7dfb60e20a4d5d2a6efb44dfb929586 Mon Sep 17 00:00:00 2001 From: lukemelia Date: Thu, 25 Jan 2007 13:59:40 +0000 Subject: [PATCH] Adjust the routing and name for the periodically executed check for deferred items. git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@407 a4c988fc-2ded-0310-b66e-134b36920a42 --- tracks/app/controllers/todos_controller.rb | 4 ++-- tracks/app/views/layouts/standard.rhtml | 3 ++- .../views/todos/{check_tickler.rjs => check_deferred.rjs} | 0 tracks/config/routes.rb | 5 +++-- 4 files changed, 7 insertions(+), 5 deletions(-) rename tracks/app/views/todos/{check_tickler.rjs => check_deferred.rjs} (100%) diff --git a/tracks/app/controllers/todos_controller.rb b/tracks/app/controllers/todos_controller.rb index df03d4be..ff541978 100644 --- a/tracks/app/controllers/todos_controller.rb +++ b/tracks/app/controllers/todos_controller.rb @@ -2,7 +2,7 @@ class TodosController < ApplicationController helper :todos - append_before_filter :init, :except => [ :destroy, :completed, :completed_archive, :check_tickler ] + append_before_filter :init, :except => [ :destroy, :completed, :completed_archive, :check_deferred ] layout 'standard' # Main method for listing tasks @@ -231,7 +231,7 @@ class TodosController < ApplicationController # Check for any due tickler items, activate them # Called by periodically_call_remote - def check_tickler + def check_deferred @due_tickles = @user.deferred_todos.find_and_activate_ready respond_to do |format| format.html { redirect_to home_path } diff --git a/tracks/app/views/layouts/standard.rhtml b/tracks/app/views/layouts/standard.rhtml index 34cde936..8621abe1 100644 --- a/tracks/app/views/layouts/standard.rhtml +++ b/tracks/app/views/layouts/standard.rhtml @@ -64,7 +64,8 @@ <%= periodically_call_remote( :url => {:controller => "login", :action => "check_expiry"}, :frequency => (5*60)) %> <% end -%> -<%= periodically_call_remote( :url => check_tickler_path, +<%= periodically_call_remote( :url => formatted_check_deferred_todos_path(:js), + :method => :post, :frequency => (10*60)) %> <%= yield %> diff --git a/tracks/app/views/todos/check_tickler.rjs b/tracks/app/views/todos/check_deferred.rjs similarity index 100% rename from tracks/app/views/todos/check_tickler.rjs rename to tracks/app/views/todos/check_deferred.rjs diff --git a/tracks/config/routes.rb b/tracks/config/routes.rb index 615e62e1..56cc56dc 100644 --- a/tracks/config/routes.rb +++ b/tracks/config/routes.rb @@ -29,11 +29,12 @@ ActionController::Routing::Routes.draw do |map| map.connect 'signup', :controller => 'login', :action => 'signup' # ToDo Routes - map.resources :todos, :member => {:toggle_check => :post} + map.resources :todos, + :member => {:toggle_check => :post}, + :collection => {:check_deferred => :post} map.with_options :controller => "todos" do |todos| todos.home '', :action => "index" todos.tickler 'tickler', :action => "list_deferred" - todos.check_tickler 'check_tickler', :action => "check_tickler" todos.done 'done', :action => "completed" todos.done_archive 'done/archive', :action => "completed_archive" todos.tag '/todos/tag/:name', :action => "tag"