phcpress 2.8.11 → 2.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4654cd0d0ce4a4104375923b42778d6966037a22
-  data.tar.gz: 8974555458ea52454a0897b31b1e4c73d10f3bff
+  metadata.gz: 272c8fa8591b97b203861406c7b27c9212e6cf38
+  data.tar.gz: 7a5c466297ce9e04c6da492adcdd7d7457c364e4
 SHA512:
-  metadata.gz: d810bba3e56d055cb4e74a14cd7fc31d74b07d46cf2c5947a803dd3bf559fed24876b212bfd9dd6dc2da3ee27c897be107df3a5b448f2a57877e54ffebc42910
-  data.tar.gz: 0bc223efb0ad3b5e5bc30b3f15b472958240983e64d5c30d83b64faeabec8167c0bad3167b22a24d561090132e5a06bd7a1d76df861da40a1b7e50ef598a77ad
+  metadata.gz: df3e98ba2f74c0b2d1092e155f1f8809835028cf118de42772b227c73e7ffcd3c4f2334d482562df3e60aabd2944ef7a538bce360141de7c6b33c8476f9979b5
+  data.tar.gz: fc15546051cb4f23bda66ffb6fa5fd93c5b7f0bd578a502375c9e5ed0cbe4f4bb04492b8c63a7487f9ed2401e7a363c9fa1e391e9f0b5abc5b71a83991c300ac

data/app/controllers/phcpress/blog/posts_controller.rb

@@ -1,40 +1,40 @@
 # Load General Controller for Engine
 require_dependency "phcpress/application_controller"
 
-# Code for Blog Posting
+# Code for News Posting
 module Phcpress
-	class Blog::PostsController < ApplicationController
+	class News::PostsController < ApplicationController
 
 		# Filters & Security
-		layout 'layouts/phcpress/blogpost/blog_layout'
+		layout 'layouts/phcpress/newspost/news_layout'
 		before_action :authenticate_user!
-		before_action :current_user?
-		before_action :set_blog_post, only: [:edit, :update, :destroy]
+		before_action :current_user
+		before_action :set_news_post, only: [:edit, :update, :destroy]
 
-		# Blog Post Index (/blog/posts)
+		# News Post Index (/news/posts)
 		def index
-			@blog_posts = Blog::Post.all
+			@news_posts = News::Post.all
 		end
 
-		# Single Blog Post (/blog/posts/1)
+		# Single News Post (/news/posts/1)
 		#def show
 		#end
 
-		# Create a New Blog Post (/blog/posts/new)
+		# Create a New News Post (/news/posts/new)
 		def new
-			@blog_post = Blog::Post.new
+			@news_post = News::Post.new
 		end
 
-		# Edit Blog Post (/blog/posts/1/edit)
+		# Edit News Post /news/posts/1/edit
 		def edit
 		end
 
 		# Create News Post /news/posts/new
 		def create
-			@blog_post = Blog::Post.new(blog_post_params)
-			@blog_post.user_id = current_user.id
-			if @blog_post.save  
-				redirect_to blog_posts_path, notice: 'Blog post was successfully created.'
+			@news_post = News::Post.new(news_post_params)
+			@news_post.user_id = current_user.id
+			if @news_post.save  
+				redirect_to news_posts_path, notice: 'News post was successfully created.'
 				else
 					render 'new'
 			end
@@ -42,8 +42,8 @@ module Phcpress
 
 		# PATCH/PUT
 		def update
-			if @blog_post.update(blog_post_params)
-				redirect_to blog_posts_path, notice: 'Blog post was successfully updated.'
+			if @news_post.update(news_post_params)
+				redirect_to news_posts_path, notice: 'News post was successfully updated.'
 			else
 				render :edit
 			end
@@ -51,25 +51,26 @@ module Phcpress
 
 		# DELETE
 		def destroy
-			@blog_post.destroy
-			redirect_to blog_posts_path, notice: 'Blog post was successfully destroyed.'
+			@news_post.destroy
+			redirect_to news_posts_path, notice: 'News post was successfully destroyed.'
 		end
 
 		private
 
 		# Common Callbacks
-		def set_blog_post
-		@blog_post = Blog::Post.find(params[:id])
+		def set_news_post
+			@news_post = News::Post.find(params[:id])
 		end
 
 		# Whitelist on what can be posted
-		def blog_post_params
-			params.require(:blog_post).permit(:blogpsttitle, :blogpsttext, :blogpstexcerpts, :pststatus, :pstimage)
+		def news_post_params
+			params.require(:news_post).permit(:newspsttitle, :newspsttext, :newspstexcerpts, :pststatus, :pstimage)
 		end
-	
+
 		# Current User
-		def current_user?(user)
-			user == current_user
+		def current_user
+			return unless session[:user_id]
+			@current_user ||= User.find(session[:user_id])
 		end
 
 	end

data/app/controllers/phcpress/news/posts_controller.rb

@@ -8,7 +8,7 @@ module Phcpress
 		# Filters & Security
 		layout 'layouts/phcpress/newspost/news_layout'
 		before_action :authenticate_user!
-		before_action :current_user?
+		before_action :current_user
 		before_action :set_news_post, only: [:edit, :update, :destroy]
 
 		# News Post Index (/news/posts)
@@ -68,8 +68,9 @@ module Phcpress
 		end
 
 		# Current User
-		def current_user?(user)
-			user == current_user
+		def current_user
+			return unless session[:user_id]
+			@current_user ||= User.find(session[:user_id])
 		end
 
 	end

data/lib/phcpress/version.rb

@@ -1,3 +1,3 @@
 module Phcpress
-    VERSION = "2.8.11"
+    VERSION = "2.8.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phcpress
 version: !ruby/object:Gem::Version
-  version: 2.8.11
+  version: 2.8.12
 platform: ruby
 authors:
 - BradPotts