diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/refinery/blog/admin/categories_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/refinery/blog/admin/posts_controller.rb | 10 | ||||
| -rw-r--r-- | app/helpers/refinery/blog/controller_helper.rb | 2 | ||||
| -rw-r--r-- | app/models/refinery/blog/post.rb | 8 | ||||
| -rw-r--r-- | app/views/refinery/blog/posts/index.html.erb | 4 |
5 files changed, 19 insertions, 6 deletions
diff --git a/app/controllers/refinery/blog/admin/categories_controller.rb b/app/controllers/refinery/blog/admin/categories_controller.rb index e9f2f89..2176484 100644 --- a/app/controllers/refinery/blog/admin/categories_controller.rb +++ b/app/controllers/refinery/blog/admin/categories_controller.rb @@ -4,6 +4,7 @@ module Refinery class CategoriesController < ::Refinery::AdminController crudify :'refinery/blog/category', + :include => [:translations], :order => 'title ASC' private diff --git a/app/controllers/refinery/blog/admin/posts_controller.rb b/app/controllers/refinery/blog/admin/posts_controller.rb index 61ac433..aeb3c43 100644 --- a/app/controllers/refinery/blog/admin/posts_controller.rb +++ b/app/controllers/refinery/blog/admin/posts_controller.rb @@ -85,9 +85,15 @@ module Refinery private def post_params - params.require(:post).permit(:title, :body, :custom_teaser, :tag_list, + params.require(:post).permit(permitted_post_params) + end + + def permitted_post_params + [ + :title, :body, :custom_teaser, :tag_list, :draft, :published_at, :custom_url, :user_id, :browser_title, - :meta_description, :source_url, :source_url_title, :category_ids => []) + :meta_description, :source_url, :source_url_title, :category_ids => [] + ] end protected diff --git a/app/helpers/refinery/blog/controller_helper.rb b/app/helpers/refinery/blog/controller_helper.rb index 7235096..1c0491b 100644 --- a/app/helpers/refinery/blog/controller_helper.rb +++ b/app/helpers/refinery/blog/controller_helper.rb @@ -6,7 +6,7 @@ module Refinery def find_blog_post unless (@post = Refinery::Blog::Post.with_globalize.friendly.find(params[:id])).try(:live?) - if refinery_user? and current_refinery_user.authorized_plugins.include?("refinerycms_blog") + if current_refinery_user && current_refinery_user.has_plugin?("refinerycms_blog") @post = Refinery::Blog::Post.friendly.find(params[:id]) else error_404 diff --git a/app/models/refinery/blog/post.rb b/app/models/refinery/blog/post.rb index d05cb14..9e69162 100644 --- a/app/models/refinery/blog/post.rb +++ b/app/models/refinery/blog/post.rb @@ -21,7 +21,8 @@ module Refinery validates :title, :presence => true, :uniqueness => true validates :body, :presence => true - validates :published_at, :author, :presence => true + validates :published_at, :presence => true + validates :author, :presence => true, if: :author_required? validates :source_url, :url => { :if => 'Refinery::Blog.validate_source_url', :update => true, :allow_nil => true, @@ -31,6 +32,11 @@ module Refinery class Translation is_seo_meta end + + # Override this to disable required authors + def author_required? + true + end # If custom_url or title changes tell friendly_id to regenerate slug when # saving record diff --git a/app/views/refinery/blog/posts/index.html.erb b/app/views/refinery/blog/posts/index.html.erb index 772f2ec..3a386f9 100644 --- a/app/views/refinery/blog/posts/index.html.erb +++ b/app/views/refinery/blog/posts/index.html.erb @@ -1,5 +1,5 @@ <% content_for :body do %> - <%= raw @page.content_for(Refinery::Pages.default_parts.first.to_sym) if Refinery::Pages.default_parts.any? %> + <%= raw @page.content_for(Refinery::Pages.default_parts.first[:slug].to_sym) if Refinery::Pages.default_parts.any? %> <% if @posts.any? %> <section id="blog_posts"> @@ -12,7 +12,7 @@ <% end %> <% content_for :side_body_prepend do -%> - <%= raw @page.content_for(Refinery::Pages.default_parts.second.to_sym) %> + <%= raw @page.content_for(Refinery::Pages.default_parts.second[:slug].to_sym) %> <% end if Refinery::Pages.default_parts.many? -%> <%= render '/refinery/blog/shared/body_content_right' %> |