phcmemberspro 6.8.2 → 6.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fc6e65782266f40ef4693057004af216d6dcbf7
-  data.tar.gz: bf69e63cbb475b6343c0634fd6907d8576f74999
+  metadata.gz: b32799629880dd328600644d2166eba85f9d7b5b
+  data.tar.gz: 2928945884f729b524f1d78c9cfdd422da4103bf
 SHA512:
-  metadata.gz: 628ed5632cff4ea5aad1809659672b24d6d7c801500c035c0e1268d7c559c095f079e8d5978bf9f83bd578f04150ad9970ca314bb6be021b888ffcb49bdc6449
-  data.tar.gz: fe34e4490431e981736953dc70094e021a9ee6441a55f9fb087aff008cc8d46bbd888df83be5ed42666e252c401d96efa7edb86b1ffe0d23b48470007ef455a4
+  metadata.gz: 83f3f6b5c82eff12d98c4df98d998a9c53826e62c70878d9c5381724af6d4c94d0b2f1f038aeddb73b4c9f3077d8efdd82cee0d1ed2fac7bfea77314abb020ea
+  data.tar.gz: b92bf7d8035497379fbf5e2d3868c4cc9f8a4b7684564795a3c2673af77d433d1c8d9d0165b5bdcee201399773f91651d4fc47215853ca7c3c9cdbb9aab7a768

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

@@ -1,62 +1,85 @@
 require_dependency "phcmemberspro/application_controller"
 
 module Phcmemberspro
-  class Directory::ListingsController < ApplicationController
-    before_action :set_directory_listing, only: [:show, :edit, :update, :destroy]
-
-    # GET /directory/listings
-    def index
-      @directory_listings = Directory::Listing.all
-    end
-
-    # GET /directory/listings/1
-    def show
-    end
-
-    # GET /directory/listings/new
-    def new
-      @directory_listing = Directory::Listing.new
-    end
-
-    # GET /directory/listings/1/edit
-    def edit
-    end
-
-    # POST /directory/listings
-    def create
-      @directory_listing = Directory::Listing.new(directory_listing_params)
-
-      if @directory_listing.save
-        redirect_to @directory_listing, notice: 'Listing was successfully created.'
-      else
-        render :new
-      end
-    end
-
-    # PATCH/PUT /directory/listings/1
-    def update
-      if @directory_listing.update(directory_listing_params)
-        redirect_to @directory_listing, notice: 'Listing was successfully updated.'
-      else
-        render :edit
-      end
-    end
-
-    # DELETE /directory/listings/1
-    def destroy
-      @directory_listing.destroy
-      redirect_to directory_listings_url, notice: 'Listing was successfully destroyed.'
-    end
-
-    private
-      # Use callbacks to share common setup or constraints between actions.
-      def set_directory_listing
-        @directory_listing = Directory::Listing.find(params[:id])
-      end
-
-      # Only allow a trusted parameter "white list" through.
-      def directory_listing_params
-        params[:directory_listing]
-      end
-  end
+	class Directory::ListingsController < ApplicationController
+
+		# Security & Action Filters
+		before_action :require_user
+		before_action :set_paper_trail_whodunnit
+		before_action :directorycategory
+		before_action :set_directory_listing, only: [:show, :edit, :update, :destroy]
+		layout 'layouts/phcmemberspro/directory/directory_all.html.erb'
+
+		# Directory Listing Index
+		def index
+			@directory_listings = Directory::Listing.where(oganization_id: membership_info.org_id)
+		end
+
+		# Show Directory Listing
+		def show
+		end
+
+		# New Directory Listing
+		def new
+			@directory_listing = Directory::Listing.new
+		end
+
+		# Edit Directory Listing Action
+		def edit
+		end
+
+		# Create Directory Listing Action
+		def create
+			@directory_listing = Directory::Listing.new(directory_listing_params)
+			@directory_listing.user_id = current_user.id
+			@directory_listing.membership_id = membership_info.id
+			@directory_listing.oganization_id = membership_info.org_id
+			if @directory_listing.save
+				redirect_to @directory_listing, notice: 'Listing was successfully created.'
+				else
+					render :new
+			end
+		end
+
+		# Update Directory Listing Action
+		def update
+			@directory_listing.user_id = current_user.id
+			@directory_listing.membership_id = membership_info.id
+			@directory_listing.oganization_id = membership_info.org_id
+			if @directory_listing.update(directory_listing_params)
+				redirect_to @directory_listing, notice: 'Listing was successfully updated.'
+				else
+					render :edit
+			end
+		end
+
+		# Delete Directory Listing
+		def destroy
+			@directory_listing.destroy
+			redirect_to directory_listings_url, notice: 'Listing was successfully destroyed.'
+		end
+
+		private
+
+		# Grab User Session Key (For ID)
+		def current_user
+			@_current_user ||= AuthRocket::Session.from_token(session[:ar_token]).try(:user)
+		end
+
+		# Get Current User from Above and Get Membership Info
+		def membership_info
+			AuthRocket::Membership.all(user_id: current_user.id).first
+		end
+		
+		# Common Callbacks
+		def set_directory_listing
+			@directory_listing = Directory::Listing.find(params[:id])
+		end
+
+		# Whitelists
+		def directory_listing_params
+			params.require(:directory_listing).permit(:business_id, :category_id, :main_id, :user_id, :membership_id, :oganization_id)
+		end
+
+	end
 end

data/app/models/phcmemberspro/directory/listing.rb

@@ -1,12 +1,20 @@
 module Phcmemberspro
-  class Directory::Listing < ActiveRecord::Base
-    
-    # Add Paper Trail
+	class Directory::Listing < ActiveRecord::Base
+
+		# Add Paper Trail
 		has_paper_trail
     
-    # Model Relationship
-    belongs_to :business, class_name: 'Members::Business'
-    belongs_to :category, class_name: 'Directory::Category'
+		# Model Relationship
+		belongs_to :business, class_name: 'Members::Business'
+		belongs_to :category, class_name: 'Directory::Category'
+
+		# Validation for Form Fields
+		validates :business_id,
+			presence: true
+
+		# Validation for Form Fields
+		validates :category_id,
+			presence: true
 
-  end
+	end
 end

data/app/views/phcmemberspro/directory/listings/index.html.erb

@@ -29,8 +29,8 @@
 					<span class="caption-subject bold uppercase"><%= yield(:phc_title_tagline) %></span>
 				</div>
 				<div class="actions">
-					<%= link_to new_directory_category_path, class: "btn blue-chambray btn-circle" do %>
-						<i class="fa fa-plus"></i> Create a New Directory Category
+					<%= link_to new_directory_listing_path, class: "btn blue-chambray btn-circle" do %>
+						<i class="fa fa-plus"></i> Create a New Directory Listing
 					<% end %>
 				</div>
 			</div>

data/db/migrate/20160612010248_create_phcmemberspro_directory_listings.rb

@@ -5,6 +5,10 @@ class CreatePhcmembersproDirectoryListings < ActiveRecord::Migration
 			t.references :business, index: true
 			t.references :category, index: true
 
+			t.string :user_id
+			t.string :membership_id
+			t.string :oganization_id
+
 			t.timestamps null: false
 
 		end

data/lib/phcmemberspro/version.rb

@@ -1,3 +1,3 @@
 module Phcmemberspro
-	VERSION = "6.8.2"
+	VERSION = "6.8.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phcmemberspro
 version: !ruby/object:Gem::Version
-  version: 6.8.2
+  version: 6.8.3
 platform: ruby
 authors:
 - BradPotts