generators/bagpipes/templates/views/messages/index.html.erb
@@ -8,6 +8,11 @@ class MessagesControllerTest < ActionController::TestCase
@topic = Topic.create! :title => "Test Topic"
end
+ test "index should render" do
+ get :index, :topic_id => @topic.id
+ assert_template 'index'
+ end
+
test "new should render" do
get :new, :topic_id => @topic.id
assert_template 'new'
@@ -21,7 +26,7 @@ class MessagesControllerTest < ActionController::TestCase
test "show unknown message should redirect" do
get :show, :topic_id => @topic.id, :id => 0
- assert_redirected_to topic_path(@topic)
+ assert_redirected_to topic_messages_path(@topic)
end
test "show unknown message should set flash" do
@@ -57,7 +62,7 @@ class MessagesControllerTest < ActionController::TestCase
test "good create should redirect" do
post :create, {:topic_id => @topic.id}.merge(good_params)
- assert_redirected_to topic_path(@topic)
+ assert_redirected_to topic_messages_path(@topic)
end
test "create reply should redirect elsewhere" do
generators/bagpipes/templates/test/functional/messages_controller_test.rb
@@ -1,6 +1,6 @@
<h1>New Message in <%= h @topic.title %></h1>
-<p><%= link_to 'Back to Messages', @topic %></p>
+<p><%= link_to 'Back to Messages', topic_messages_path(@topic) %></p>
<% form_for @message, :url => topic_messages_path(@topic) do |f| %>
<%= f.hidden_field :parent_id %>
generators/bagpipes/templates/views/messages/new.html.erb
@@ -1,6 +1,6 @@
<h1>
<span>
- <%= link_to h(@topic.title), @topic %> >
+ <%= link_to h(@topic.title), topic_messages_path(@topic) %> >
<% if @message.parent %>
<%= link_to h(@message.parent.title), topic_message_path(@topic, @message.parent) %> >
<% end %>
generators/bagpipes/templates/views/messages/show.html.erb
@@ -11,7 +11,7 @@
<% @topics.each_with_index do |topic, i| %>
<tr class="<%= i%2 == 1 ? 'even' : 'odd' %>">
<td>
- <%= link_to h(topic.title), topic %>
+ <%= link_to h(topic.title), topic_messages_path(topic) %>
</td>
<td class="counter">
<%= topic.messages.children_of(nil).count %>
generators/bagpipes/templates/views/topics/index.html.erb
@@ -4,14 +4,14 @@ module Bagpipes
def self.included(base)
base.class_eval do
before_filter :require_topic
- before_filter :require_member_login, :except => :show
+ before_filter :require_member_login, :except => [:show, :index]
layout 'bagpipes'
end
end
- # TODO: add index action for showing all messages in a topic
# TODO: provide modular search for messages via index action
+ def index; end
def new
@parent = @topic.messages.find_by_id(params[:parent_id])
@@ -28,7 +28,7 @@ module Bagpipes
@message = @topic.messages.find(params[:id])
rescue ActiveRecord::RecordNotFound
flash[:error] = "This message no longer exists"
- redirect_to @topic
+ redirect_to topic_messages_path(@topic)
end
def create
@@ -36,7 +36,7 @@ module Bagpipes
if @message.save
flash[:notice] = "You have created a new message in \"#{@topic.title}\""
- redirect_to @message.parent ? topic_message_path(@topic, @message.parent) : @topic
+ redirect_to @message.parent ? topic_message_path(@topic, @message.parent) : topic_messages_path(@topic)
else
flash.now[:form_error] = @message
render :action => 'new'
lib/bagpipes/controllers/messages_controller.rb
generators/bagpipes/templates/views/topics/show.html.erb
f9de0ebd00280bca0a208245a0a6730f6f81177b
Ben Scofield
git@turrean.com
http://github.com/bscofield/bagpipes/commit/af96f0c20098624ec2cbd7c7c07108694d061ace
af96f0c20098624ec2cbd7c7c07108694d061ace
2008-09-11T03:30:17-07:00
2008-09-11T03:30:17-07:00
switch from using topics#show to messages#index
5f7b4e8b41cad5575573da507c1590c625968114
Ben Scofield
git@turrean.com