diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 0077313..4e3022e 100755 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,4 +1,7 @@ class ApplicationController < ActionController::Base + + helper :all + protect_from_forgery rescue_from CanCan::AccessDenied do |exception| diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index 671ff1d..394bc10 100755 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -1,9 +1,17 @@ class PostsController < ApplicationController + + include ApplicationHelper + load_and_authorize_resource :topic load_and_authorize_resource :post, :through => :topic, :shallow => true before_filter :check_for_cancel#, :only[:create, :update] + def show + @topic = @post.topic + @my_blockquote = block_quote + end + def new if params[:quote] quote_post = Post.find(params[:quote]) @@ -18,7 +26,7 @@ class PostsController < ApplicationController @post.user ||= current_user if @post.save flash[:notice] = "Post was successfully created." - redirect_to topic_path(@post.topic, :page => @post.topic.posts.page.per(10).num_pages) + redirect_to topic_path(@post.topic, :page => @post.topic.posts.page.per(10).num_pages, :anchor => @post.id) else render :action => 'new' end diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index 14c43c3..04c0bea 100755 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -1,4 +1,7 @@ class TopicsController < ApplicationController + + include ApplicationHelper + load_and_authorize_resource :forum load_and_authorize_resource :topic, :through => :forum, :shallow => true @@ -9,15 +12,7 @@ class TopicsController < ApplicationController @posts = @topic.posts.page(params[:page]).per(10) - @my_blockquote = { - 'Quote' => [ - /\[quote(:.*)?=(.*?)\](.*?)\[\/quote\1?\]/mi, - '
\2“\3”', - 'Quote with citation', - '[quote=mike]please quote me[/quote]', - :quote - ], - } + @my_blockquote = block_quote end def create diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ef1c9d2..8e37c76 100755 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -5,4 +5,16 @@ module ApplicationHelper :confirm => 'Are you sure? Any changes will be lost.' end + def block_quote + return { + 'Quote' => [ + /\[quote(:.*)?=(.*?)\](.*?)\[\/quote\1?\]/mi, + '
\2“\3”', + 'Quote with citation', + '[quote=mike]please quote me[/quote]', + :quote + ], + } + end + end diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb index 4fe454c..3a65f70 100755 --- a/app/views/topics/show.html.erb +++ b/app/views/topics/show.html.erb @@ -13,8 +13,9 @@
| + <%= link_to ("#"+ post.id.to_s ), post %> <%= post.user.username %> <%= image_tag post.user.gravatar_url %> diff --git a/config/routes.rb b/config/routes.rb index 0fcbe8c..f010917 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,6 +7,8 @@ Community::Application.routes.draw do end root :to => 'categories#index', :via => :get end + + resources :posts, :only => :show devise_for :users, :controllers => {:registrations => "registrations"} |