phcmemberspro 5.3.4 → 5.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff4ce3bf25392465b03116ebec8e3a731e90f166
-  data.tar.gz: f76e04bccc7012fe6f92f81a1d3d0c0f06ba91fb
+  metadata.gz: 898eac32652cfaf0096c149bb8ebf8455e4c44f2
+  data.tar.gz: 66fe6a7bcb04b674ffae8bc88c6e7162b3c61227
 SHA512:
-  metadata.gz: bb639c3c314dc0001b3085ca5a122ce2981a4ae48d623c8be12abbb049371112c750d50c2339b3335d8c8afd752f2b9ca0e53ae89c23788361dd50751dcdea84
-  data.tar.gz: 007bfb20943c81da2a41ecafd853c8a9e8189684e15198239de6f40d98c10528a4827120f351697311689189a4d4b30fc5262921e9243df170c95111aebaa375
+  metadata.gz: fb6619b95dcecc08f2db01df7940ede13ec1111b0dd045524fbc476c138c1ab991c78e789be1601a7c1645701568f66eb34e009695ad5f7a856e8a03f0dc54ff
+  data.tar.gz: 143f605dc2ab711640a0b40d06548df17cacf2617542f2eccb9f89fcd249debcb2334c9906dbe15e479ac1bde640e33909902f34272375be27ba19dd4a544d11

data/app/controllers/phcmemberspro/directory/categories_controller.rb

@@ -10,7 +10,7 @@ module Phcmemberspro
 
 		# Directory Category Index
 		def index
-			@directory_categories = Directory::Category.user_id.order('catname ASC')
+			@directory_categories = Directory::Category.current_user.id.order('catname ASC')
 		end
 
 		# Directory Category Details
@@ -55,6 +55,11 @@ module Phcmemberspro
 
 		private
 
+		# Grab User Session Key (For ID)
+		def current_user
+			@_current_user ||= AuthRocket::Session.from_token(session[:ar_token]).try(:user)
+		end
+
 		# Common Callbacks
 		def set_directory_category
 			@directory_category = Directory::Category.find(params[:id])

data/app/controllers/phcmemberspro/directory/catlists_controller.rb

@@ -11,14 +11,10 @@ module Phcmemberspro
 		# Add Directory Category Information 
 		before_action :directorycategory
 
-		def directorycategory  
-			@directory_category = Directory::Category.find(params[:category_id])
-		end
-
 		# Directory Listing Index
 		def index
 			category = Directory::Category.find(params[:category_id])
-			@directory_catlists = category.catlists.user_id
+			@directory_catlists = category.catlists.current_user.id
 		end
 
 		# Show Directory Listing
@@ -85,6 +81,16 @@ module Phcmemberspro
 
 		private
 
+		# Get Directory Category
+		def directorycategory  
+			@directory_category = Directory::Category.find(params[:category_id])
+		end
+
+		# Grab User Session Key (For ID)
+		def current_user
+			@_current_user ||= AuthRocket::Session.from_token(session[:ar_token]).try(:user)
+		end
+
 		# Common Callbacks
 		def set_directory_catlist
 			@directory_catlist = Directory::Catlist.find(params[:id])

data/app/controllers/phcmemberspro/members/businesses_controller.rb

@@ -11,14 +11,10 @@ module Phcmemberspro
 		# Add Member Contact Information 
 		before_action :phc_member_mains_info
 
-		def phc_member_mains_info  
-			@members_main = Members::Main.find(params[:main_id])
-		end
-
 		# Member Members Business Information Index
 		def index
 			main = Members::Main.find(params[:main_id])
-			@members_businesses = main.businesses.user_id.order('mbcompanyname ASC')
+			@members_businesses = main.businesses.current_user.id.order('mbcompanyname ASC')
 		end
 
 		# Detailed Member Contact Information
@@ -73,7 +69,17 @@ module Phcmemberspro
 		end
 
 		private
+		
+		# Grab Member Information
+		def phc_member_mains_info  
+			@members_main = Members::Main.find(params[:main_id])
+		end
 
+		# Grab User Session Key (For ID)
+		def current_user
+			@_current_user ||= AuthRocket::Session.from_token(session[:ar_token]).try(:user)
+		end
+		
 		# Common Callbacks
 		def set_members_business
 			@members_business = Members::Business.find(params[:id])

data/app/controllers/phcmemberspro/members/contacts_controller.rb

@@ -11,14 +11,10 @@ module Phcmemberspro
 		# Add Member Contact Information 
 		before_action :phc_member_mains_info
 
-		def phc_member_mains_info  
-			@members_main = Members::Main.find(params[:main_id])
-		end
-
 		# Member Contact Index
 		def index
 			main = Members::Main.find(params[:main_id])
-			@members_contacts = main.contacts.order('mcprovince ASC')
+			@members_contacts = main.contacts.current_user.id.order('mcprovince ASC')
 		end
 
 		# Detailed Member Contact Information
@@ -74,6 +70,16 @@ module Phcmemberspro
 
 		private
 
+		# Get Main Member Info
+		def phc_member_mains_info  
+			@members_main = Members::Main.find(params[:main_id])
+		end
+
+		# Grab User Session Key (For ID)
+		def current_user
+			@_current_user ||= AuthRocket::Session.from_token(session[:ar_token]).try(:user)
+		end
+
 		# Common Callbacks
 		def set_members_contact
 			@members_contact = Members::Contact.find(params[:id])

data/app/controllers/phcmemberspro/members/mains_controller.rb

@@ -2,7 +2,7 @@ require_dependency "phcmemberspro/application_controller"
 
 module Phcmemberspro
 	class Members::MainsController < ApplicationController
-	
+
 		# Security & Action Filters
 		before_action :require_user
 		layout :phcmemberspro_membersmain_layouts_resolver
@@ -10,7 +10,7 @@ module Phcmemberspro
 
 		# Member Profile List
 		def index
-			@members_mains = Members::Main.user_id
+			@members_mains = Members::Main.current_user.id
 		end
 
 		# Detailed Member Profile
@@ -54,6 +54,11 @@ module Phcmemberspro
 
 		private
 
+		# Grab User Session Key (For ID)
+		def current_user
+			@_current_user ||= AuthRocket::Session.from_token(session[:ar_token]).try(:user)
+		end
+
 		# Common Callbacks
 		def set_members_main
 			@members_main = Members::Main.find(params[:id])

data/lib/phcmemberspro/version.rb

@@ -1,3 +1,3 @@
 module Phcmemberspro
-	VERSION = "5.3.4"
+	VERSION = "5.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcmemberspro
 version: !ruby/object:Gem::Version
-  version: 5.3.4
+  version: 5.3.5
 platform: ruby
 authors:
 - BradPotts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-30 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails