spec/controllers/admin/comments_routing_spec.rb @@ -46,6 +46,7 @@ class Admin::CommentsController < ApplicationController rescue ActiveRecord::RecordNotFound redirect_to admin_comments_path end + def show redirect_to edit_admin_comment_path(params[:id]) end app/controllers/admin/comments_controller.rb @@ -15,11 +15,11 @@ </td> <td class="controls right"> <div class="nowrap"> - <%= link_to("approve", approve_admin_comment_path(comment)) unless comment.approved? %> - <%= link_to("unapprove", unapprove_admin_comment_path(comment)) if comment.approved? %> + <%= link_to("approve", approve_admin_comment_path(comment), :method => :put) unless comment.approved? %> + <%= link_to("unapprove", unapprove_admin_comment_path(comment), :method => :put) if comment.approved? %> </div> <div> - <%= link_to "remove", admin_comment_path(comment), :method => :delete, :confirm => "Are you sure?" %> + <%= link_to "delete", admin_comment_path(comment), :method => :delete, :confirm => "Are you sure?" %> </div> <div> <%= link_to "edit", edit_admin_comment_path(comment) %> app/views/admin/comments/_comment.rhtml @@ -23,7 +23,7 @@ </tbody> </table> -<p><%= link_to "Delete All Unapproved", destroy_unapproved_comments_url, :method => :delete %></p> +<p><%= link_to "Delete All Unapproved", destroy_unapproved_admin_comments_url, :method => :delete %></p> <%= will_paginate @comments %> app/views/admin/comments/index.rhtml @@ -1,8 +1,4 @@ -begin - require_dependency 'application_controller' -rescue MissingSourceFile - require_dependency 'application' -end +require_dependency 'application_controller' class CommentsExtension < Radiant::Extension version "0.0.6" @@ -10,18 +6,14 @@ class CommentsExtension < Radiant::Extension url "http://github.com/saturnflyer/radiant-comments" define_routes do |map| + map.namespace :admin do |admin| + admin.connect 'comments/:status', :controller => 'comments', :status => /all|approved|unapproved/, :conditions => { :method => :get } + admin.resources :comments, :member => { :remove => :get, :approve => :put, :unapprove => :put }, :collection => {:destroy_unapproved => :delete} + admin.page_enable_comments '/pages/:page_id/comments/enable', :controller => 'comments', :action => 'enable', :conditions => {:method => :put} + end map.with_options(:controller => 'admin/comments') do |comments| - comments.destroy_unapproved_comments '/admin/comments/unapproved/destroy', :action => 'destroy_unapproved', :conditions => {:method => :delete} - - comments.admin_page_enable_comments 'admin/pages/:page_id/comments/enable', :action => 'enable', :conditions => { :method => :put } - - comments.connect 'admin/comments/:status', :status => /all|approved|unapproved/, :conditions => { :method => :get } - comments.connect 'admin/comments/:status.:format', :status => /all|approved|unapproved/, :conditions => { :method => :get } - comments.connect 'admin/pages/:page_id/comments/:status', :status => /all|approved|unapproved/, :conditions => { :method => :get } comments.connect 'admin/pages/:page_id/comments/:status.:format', :status => /all|approved|unapproved/, :conditions => { :method => :get } - - comments.resources :comments, :path_prefix => "/admin", :name_prefix => "admin_", :member => {:approve => :get, :unapprove => :get} comments.admin_page_comments 'admin/pages/:page_id/comments/:action' comments.admin_page_comment 'admin/pages/:page_id/comments/:id/:action' end comments_extension.rb @@ -6,31 +6,6 @@ describe Admin::CommentsController do login_as :admin end - describe "routing" do - %w(all approved unapproved).each do |status| - it "should route to the index action for #{status} comments" do - params_from(:get, "/admin/comments/#{status}").should == { :controller => "admin/comments", :action => "index", :status => status } - end - it "should route to the index action for #{status} comments on the page" do - params_from(:get, "/admin/pages/1/comments/#{status}").should == { :controller => "admin/comments", :action => "index", :page_id => "1", :status => status } - end - end - - it "should route to the destroy_unapproved action" do - params_from(:delete, "/admin/comments/unapproved/destroy").should == { :controller => "admin/comments", :action => "destroy_unapproved" } - end - - it "should route to the enable action for the page" do - params_from(:put, "/admin/pages/1/comments/enable").should == { :controller => "admin/comments", :action => "enable", :page_id => "1" } - end - - %w(approve unapprove).each do |action| - it "should route to the #{action} action" do - params_from(:get, "/admin/comments/1/#{action}").should == { :controller => "admin/comments", :action => action, :id => "1" } - end - end - end - describe "requesting 'show' with GET" do it "should redirect to the comment edit screen" do id = comments(:first).id spec/controllers/admin/comments_controller_spec.rb a1b13406c0e1035b820bda3509f72f5a97e1365d Jim Gay jim@saturnflyer.com http://github.com/artofmission/radiant-comments/commit/2d6ca58ebe0502aae81c4d954f59835fb24e0522 2d6ca58ebe0502aae81c4d954f59835fb24e0522 2009-06-20T20:27:27-07:00 2009-06-20T20:27:27-07:00 cleaning up routes 54e243368c5870fe10dfc163ba009c472e683664 Jim Gay jim@saturnflyer.com