Skip to content

Commit

Permalink
Final fix for rss feed. I hope!
Browse files Browse the repository at this point in the history
  • Loading branch information
Brandon F committed Nov 11, 2010
1 parent 51b453e commit 1b2827d
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 2 deletions.
2 changes: 2 additions & 0 deletions app/controllers/user_status_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ class UserStatusController < ApplicationController
before_filter :require_logged, :except => :show_feed
before_filter :require_key, :only => :show_feed

accept_key_auth :show_feed

def index
@status = UserStatus.new
@users = User.all :conditions => {:type => 'User'}, :order => "lastname, firstname DESC"
Expand Down
2 changes: 1 addition & 1 deletion app/views/user_status/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<% html_title "Latest updates" %>
<div>
<%= link_to "Show Feed", {:action => "show_feed", :key => User.current.rss_key}, :class => 'atom' %><br /> <br />
<%= link_to "Show Feed", {:action => "show_feed", :key => User.current.rss_key, :format => 'atom'}, :class => 'atom' %><br /> <br />
<h3>What are you doing?</h3>
<% form_for @status, :url => {:action => "create"} do |f|%>
<%= f.error_messages %>
Expand Down
5 changes: 5 additions & 0 deletions config/routes.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ActionController::Routing::Routes.draw do |map|

map.connect 'user_status/show_feed.:format', :controller => "user_status", :action => "show_feed"

end
2 changes: 1 addition & 1 deletion init.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
author 'Brandon Farmer'
description 'Allows you to find out what co workers are doing'
version '0.0.1'

permission :feed_view, {:user_status => [:show_feed]}, :public => true
menu :top_menu, :user_status, {:controller => 'user_status', :action => 'index'}, :caption => 'Statuses', :if => Proc.new { User.current.logged? }

end

0 comments on commit 1b2827d

Please sign in to comment.