svn commit: r656899 - in /ode/sandbox/singleshot: app/controllers/tasks_controller.rb app/views/tasks/index.html.erb config/routes.rb

[as...@apache.org]

Author: assaf
Date: Thu May 15 17:02:54 2008
New Revision: 656899

URL: http://svn.apache.org/viewvc?rev=656899&view=rev
Log:
Fixed task lists feed/ical links.

Modified:
    ode/sandbox/singleshot/app/controllers/tasks_controller.rb
    ode/sandbox/singleshot/app/views/tasks/index.html.erb
    ode/sandbox/singleshot/config/routes.rb

Modified: ode/sandbox/singleshot/app/controllers/tasks_controller.rb
URL: http://svn.apache.org/viewvc/ode/sandbox/singleshot/app/controllers/tasks_controller.rb?rev=656899&r1=656898&r2=656899&view=diff
==============================================================================
--- ode/sandbox/singleshot/app/controllers/tasks_controller.rb (original)
+++ ode/sandbox/singleshot/app/controllers/tasks_controller.rb Thu May 15 17:02:54 2008
@@ -8,6 +8,8 @@
   layout 'application'
 
   def index
+    @alternate = { Mime::ATOM=>formatted_tasks_url(:format=>:atom, :access_key=>authenticated.access_key), 
+                   Mime::ICS=>formatted_tasks_url(:format=>:ics, :access_key=>authenticated.access_key) }
     @tasks = Task.with_stakeholders.for_stakeholder(authenticated).pending.prioritized
   end
 

Modified: ode/sandbox/singleshot/app/views/tasks/index.html.erb
URL: http://svn.apache.org/viewvc/ode/sandbox/singleshot/app/views/tasks/index.html.erb?rev=656899&r1=656898&r2=656899&view=diff
==============================================================================
--- ode/sandbox/singleshot/app/views/tasks/index.html.erb (original)
+++ ode/sandbox/singleshot/app/views/tasks/index.html.erb Thu May 15 17:02:54 2008
@@ -1,4 +1,3 @@
-<% @alternate = { Mime::ATOM=>feed_tasks_url, Mime::ICS=>ical_tasks_url } %>
 <ol class='tasks'>
   <% @tasks.each do |task| %>
     <% content_tag_for 'li', task do %>

Modified: ode/sandbox/singleshot/config/routes.rb
URL: http://svn.apache.org/viewvc/ode/sandbox/singleshot/config/routes.rb?rev=656899&r1=656898&r2=656899&view=diff
==============================================================================
--- ode/sandbox/singleshot/config/routes.rb (original)
+++ ode/sandbox/singleshot/config/routes.rb Thu May 15 17:02:54 2008
@@ -1,7 +1,7 @@
 ActionController::Routing::Routes.draw do |map|
 
   map.resource 'session'
-  map.resources 'tasks', :collection=>{ 'following'=>:get, 'completed'=>:get, 'feed'=>:get, 'ical'=>:get }
+  map.resources 'tasks', :collection=>{ 'following'=>:get, 'completed'=>:get }
   map.resource 'activity'
   map.day_activity 'activity/:year/:month/:day', :controller=>'activities', :action=>'show', :year =>/\d{4}/, :month=>/\d{1,2}/, :day=>/\d{1,2}/
   map.root :controller=>'tasks'