phcmemberspro 9.5.7 → 9.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b1085910f36d09e6bdb0473297cee0c5cd74c0c
-  data.tar.gz: 178f1ad3bff11b1d7eee929f7d2feffbcb1addd0
+  metadata.gz: 361ad3985f2ed059e0b601b5dd1b725f3e9d6ad5
+  data.tar.gz: 2c1420f33a905b55b36325d739f1f27187a68ca5
 SHA512:
-  metadata.gz: 93f5964ef98f028473d8028cb39fbf0e19b60faab1d4564999bcfefe1c94104b31a778540aa8c6bc9d28dc9c49e798d25093bf88d568a58513c438f146ff397e
-  data.tar.gz: 4ebe7a66aea0375ff4df93280f3e495ae98492116029b80a29bf5d4f8a940c162111b44b6682e34e5d3d3d045eeef26c3cfd3f3b4fcacae842b102f25cfaeb16
+  metadata.gz: 5cd39f3f391e41d59d126f63e360a0f562e72d12bc6720e12214d75a49b0c5631b8d7bdf2d9f3718fec7e512c66ccc7c1c19509f8533bd495edf9808400774fb
+  data.tar.gz: 455426db6528591cd495455548113507c6fcb24fd4eef2b89760edb803d69a9473e272b1fc44842ae0a29c9e5ab861b395e0aa6ec833b5a5250e4599763276cc

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

@@ -69,7 +69,7 @@ module Phcmemberspro
 
 		# Whitelist
 		def directory_category_params
-			params.require(:directory_category).permit(:catname)
+			params.require(:directory_category).permit(:catname, :user_id, :membership_id, :oganization_id)
 		end
 
 	end

data/app/controllers/phcmemberspro/member/addresses_controller.rb

@@ -76,7 +76,7 @@ module Phcmemberspro
 
 		# Whitelist
 		def member_address_params
-			params.require(:member_address).permit(:mcaddressl1, :mcaddressl2, :mccity, :mcprovince, :mccountry, :mcpostalcode, :mctype, :profile_id)
+			params.require(:member_address).permit(:mcaddressl1, :mcaddressl2, :mccity, :mcprovince, :mccountry, :mcpostalcode, :mctype, :profile_id, :user_id, :membership_id, :oganization_id)
 		end
 
 	end

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

@@ -41,9 +41,6 @@ module Phcmemberspro
 			@member_listing.membership_id = membership_info.id
 			@member_listing.oganization_id = membership_info.org_id
 			if @member_listing.save
-				@member_listing.user_id = current_user.id
-				@member_listing.membership_id = membership_info.id
-				@member_listing.oganization_id = membership_info.org_id
 				@member_listing.categorylistings.build
 				redirect_to member_profile_listings_url, notice: 'Listing was successfully created.'
 				else
@@ -57,9 +54,6 @@ module Phcmemberspro
 			@member_listing.membership_id = membership_info.id
 			@member_listing.oganization_id = membership_info.org_id
 			if @member_listing.update(member_listing_params)
-				@member_listing.user_id = current_user.id
-				@member_listing.membership_id = membership_info.id
-				@member_listing.oganization_id = membership_info.org_id
 				@member_listing.categorylistings.build
 				redirect_to member_profile_listings_url, notice: 'Listing was successfully updated.'
 				else
@@ -84,7 +78,7 @@ module Phcmemberspro
 
 		# Whitelist
 		def member_listing_params
-			params.require(:member_listing).permit(:mbcompanyname, :mbcontactname, :mbaddressl1, :mbaddressl2, :mbcity, :mbcountry, :mbprovince, :mbpostalcode, :mbphone, :mbcontactemail, :mbwebsite, :profile_id, category_ids: [])
+			params.require(:member_listing).permit(:mbcompanyname, :mbcontactname, :mbaddressl1, :mbaddressl2, :mbcity, :mbcountry, :mbprovince, :mbpostalcode, :mbphone, :mbcontactemail, :mbwebsite, :profile_id, :user_id, :membership_id, :oganization_id, category_ids: [])
 		end
 
 	end

data/app/controllers/phcmemberspro/member/profiles_controller.rb

@@ -69,7 +69,7 @@ module Phcmemberspro
 
 		# Whitelist
 		def member_profile_params
-			params.require(:member_profile).permit(:mfirstname, :mlastname, :mtitle, :memail, :mphone, :mnotes)
+			params.require(:member_profile).permit(:mfirstname, :mlastname, :mtitle, :memail, :mphone, :mnotes, :user_id, :membership_id, :oganization_id)
 		end
 
 	end

data/config/routes.rb

@@ -34,9 +34,8 @@ Phcmemberspro::Engine.routes.draw do
 
 		# Members Main Index
 		root 'categories#index'
-
 		resources :categories, class_name: 'Phcmemberspro::Directory::Category'
-		resources :categorylistings, class_name: 'Phcmemberspro::Directory::Categorylisting'
+
 	end
 	
 	# Mount Account Routes

data/db/migrate/20160714193304_create_versions.rb

@@ -1,80 +1,80 @@
-# This migration creates the `versions` table, the only schema PT requires.
-# All other migrations PT provides are optional.
-class CreateVersions < ActiveRecord::Migration
-  # Class names of MySQL adapters.
-  # - `MysqlAdapter` - Used by gems: `mysql`, `activerecord-jdbcmysql-adapter`.
-  # - `Mysql2Adapter` - Used by `mysql2` gem.
-  MYSQL_ADAPTERS = [
-    "ActiveRecord::ConnectionAdapters::MysqlAdapter",
-    "ActiveRecord::ConnectionAdapters::Mysql2Adapter"
-  ].freeze
-
-  # The largest text column available in all supported RDBMS is
-  # 1024^3 - 1 bytes, roughly one gibibyte.  We specify a size
-  # so that MySQL will use `longtext` instead of `text`.  Otherwise,
-  # when serializing very large objects, `text` might not be big enough.
-  TEXT_BYTES = 1_073_741_823
-
-  def change
-    create_table :versions, versions_table_options do |t|
-      t.string   :item_type, item_type_options
-      t.integer  :item_id,   null: false
-      t.string   :event,     null: false
-      t.string   :whodunnit
-      t.text     :object, limit: TEXT_BYTES
-
-      # Known issue in MySQL: fractional second precision
-      # -------------------------------------------------
-      #
-      # MySQL timestamp columns do not support fractional seconds unless
-      # defined with "fractional seconds precision". MySQL users should manually
-      # add fractional seconds precision to this migration, specifically, to
-      # the `created_at` column.
-      # (https://dev.mysql.com/doc/refman/5.6/en/fractional-seconds.html)
-      #
-      # MySQL users should also upgrade to rails 4.2, which is the first
-      # version of ActiveRecord with support for fractional seconds in MySQL.
-      # (https://github.com/rails/rails/pull/14359)
-      #
-      t.datetime :created_at
-    end
-    add_index :versions, [:item_type, :item_id]
-  end
-
-  private
-
-  # MySQL 5.6 utf8mb4 limit is 191 chars for keys used in indexes.
-  # See https://github.com/airblade/paper_trail/issues/651
-  def item_type_options
-    opt = { null: false }
-    opt[:limit] = 191 if mysql?
-    opt
-  end
-
-  def mysql?
-    MYSQL_ADAPTERS.include?(connection.class.name)
-  end
-
-  # Even modern versions of MySQL still use `latin1` as the default character
-  # encoding. Many users are not aware of this, and run into trouble when they
-  # try to use PaperTrail in apps that otherwise tend to use UTF-8. Postgres, by
-  # comparison, uses UTF-8 except in the unusual case where the OS is configured
-  # with a custom locale.
-  #
-  # - https://dev.mysql.com/doc/refman/5.7/en/charset-applications.html
-  # - http://www.postgresql.org/docs/9.4/static/multibyte.html
-  #
-  # Furthermore, MySQL's original implementation of UTF-8 was flawed, and had
-  # to be fixed later by introducing a new charset, `utf8mb4`.
-  #
-  # - https://mathiasbynens.be/notes/mysql-utf8mb4
-  # - https://dev.mysql.com/doc/refman/5.5/en/charset-unicode-utf8mb4.html
-  #
-  def versions_table_options
-    if mysql?
-      { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci" }
-    else
-      {}
-    end
-  end
-end
+# This migration creates the `versions` table, the only schema PT requires.
+# All other migrations PT provides are optional.
+class CreateVersions < ActiveRecord::Migration
+  # Class names of MySQL adapters.
+  # - `MysqlAdapter` - Used by gems: `mysql`, `activerecord-jdbcmysql-adapter`.
+  # - `Mysql2Adapter` - Used by `mysql2` gem.
+  MYSQL_ADAPTERS = [
+    "ActiveRecord::ConnectionAdapters::MysqlAdapter",
+    "ActiveRecord::ConnectionAdapters::Mysql2Adapter"
+  ].freeze
+
+  # The largest text column available in all supported RDBMS is
+  # 1024^3 - 1 bytes, roughly one gibibyte.  We specify a size
+  # so that MySQL will use `longtext` instead of `text`.  Otherwise,
+  # when serializing very large objects, `text` might not be big enough.
+  TEXT_BYTES = 1_073_741_823
+
+  def change
+    create_table :versions, versions_table_options do |t|
+      t.string   :item_type, item_type_options
+      t.integer  :item_id,   null: false
+      t.string   :event,     null: false
+      t.string   :whodunnit
+      t.text     :object, limit: TEXT_BYTES
+
+      # Known issue in MySQL: fractional second precision
+      # -------------------------------------------------
+      #
+      # MySQL timestamp columns do not support fractional seconds unless
+      # defined with "fractional seconds precision". MySQL users should manually
+      # add fractional seconds precision to this migration, specifically, to
+      # the `created_at` column.
+      # (https://dev.mysql.com/doc/refman/5.6/en/fractional-seconds.html)
+      #
+      # MySQL users should also upgrade to rails 4.2, which is the first
+      # version of ActiveRecord with support for fractional seconds in MySQL.
+      # (https://github.com/rails/rails/pull/14359)
+      #
+      t.datetime :created_at
+    end
+    add_index :versions, [:item_type, :item_id]
+  end
+
+  private
+
+  # MySQL 5.6 utf8mb4 limit is 191 chars for keys used in indexes.
+  # See https://github.com/airblade/paper_trail/issues/651
+  def item_type_options
+    opt = { null: false }
+    opt[:limit] = 191 if mysql?
+    opt
+  end
+
+  def mysql?
+    MYSQL_ADAPTERS.include?(connection.class.name)
+  end
+
+  # Even modern versions of MySQL still use `latin1` as the default character
+  # encoding. Many users are not aware of this, and run into trouble when they
+  # try to use PaperTrail in apps that otherwise tend to use UTF-8. Postgres, by
+  # comparison, uses UTF-8 except in the unusual case where the OS is configured
+  # with a custom locale.
+  #
+  # - https://dev.mysql.com/doc/refman/5.7/en/charset-applications.html
+  # - http://www.postgresql.org/docs/9.4/static/multibyte.html
+  #
+  # Furthermore, MySQL's original implementation of UTF-8 was flawed, and had
+  # to be fixed later by introducing a new charset, `utf8mb4`.
+  #
+  # - https://mathiasbynens.be/notes/mysql-utf8mb4
+  # - https://dev.mysql.com/doc/refman/5.5/en/charset-unicode-utf8mb4.html
+  #
+  def versions_table_options
+    if mysql?
+      { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci" }
+    else
+      {}
+    end
+  end
+end

data/db/migrate/20160728230720_create_phcmemberspro_directory_categories.rb

@@ -1,15 +1,15 @@
-class CreatePhcmembersproDirectoryCategories < ActiveRecord::Migration[5.0]
-	def change
-		create_table :phcmemberspro_directory_categories do |t|
-
-			t.string :catname
-
-			t.string :user_id
-			t.string :membership_id
-			t.string :oganization_id
-
-			t.timestamps
-
-		end
-	end
-end
+class CreatePhcmembersproDirectoryCategories < ActiveRecord::Migration[5.0]
+	def change
+		create_table :phcmemberspro_directory_categories do |t|
+
+			t.string :catname
+
+			t.string :user_id
+			t.string :membership_id
+			t.string :oganization_id
+
+			t.timestamps
+
+		end
+	end
+end

data/db/migrate/20160728230830_create_phcmemberspro_directory_categorylistings.rb

@@ -1,16 +1,12 @@
-class CreatePhcmembersproDirectoryCategorylistings < ActiveRecord::Migration[5.0]
-	def change
-		create_table :phcmemberspro_directory_categorylistings do |t|
-
-			t.references :category
-			t.references :listing
-
-			t.string :user_id
-			t.string :membership_id
-			t.string :oganization_id
-
-			t.timestamps
-
-		end
-	end
-end
+class CreatePhcmembersproDirectoryCategorylistings < ActiveRecord::Migration[5.0]
+	def change
+		create_table :phcmemberspro_directory_categorylistings do |t|
+
+			t.references :category
+			t.references :listing
+
+			t.timestamps
+
+		end
+	end
+end

data/db/migrate/20160728230901_create_phcmemberspro_member_addresses.rb

@@ -1,23 +1,23 @@
-class CreatePhcmembersproMemberAddresses < ActiveRecord::Migration[5.0]
-	def change
-		create_table :phcmemberspro_member_addresses do |t|
-
-			t.string :mcaddressl1
-			t.string :mcaddressl2
-			t.string :mccity
-			t.string :mcprovince
-			t.string :mccountry
-			t.string :mcpostalcode
-			t.string :mctype
-
-			t.references :profile
-
-			t.string :user_id
-			t.string :membership_id
-			t.string :oganization_id
-
-			t.timestamps
-
-		end
-	end
+class CreatePhcmembersproMemberAddresses < ActiveRecord::Migration[5.0]
+	def change
+		create_table :phcmemberspro_member_addresses do |t|
+
+			t.string :mcaddressl1
+			t.string :mcaddressl2
+			t.string :mccity
+			t.string :mcprovince
+			t.string :mccountry
+			t.string :mcpostalcode
+			t.string :mctype
+
+			t.references :profile
+
+			t.string :user_id
+			t.string :membership_id
+			t.string :oganization_id
+
+			t.timestamps
+
+		end
+	end
 end

data/db/migrate/20160728231011_create_phcmemberspro_member_listings.rb

@@ -1,27 +1,27 @@
-class CreatePhcmembersproMemberListings < ActiveRecord::Migration[5.0]
-	def change
-		create_table :phcmemberspro_member_listings do |t|
-
-			t.string :mbcompanyname
-			t.string :mbcontactname
-			t.string :mbaddressl1
-			t.string :mbaddressl2
-			t.string :mbcity
-			t.string :mbprovince
-			t.string :mbcountry
-			t.string :mbpostalcode
-			t.string :mbphone
-			t.string :mbcontactemail
-			t.string :mbwebsite
-
-			t.references :profile
-
-			t.string :user_id
-			t.string :membership_id
-			t.string :oganization_id
-
-			t.timestamps
-
-		end
-	end
+class CreatePhcmembersproMemberListings < ActiveRecord::Migration[5.0]
+	def change
+		create_table :phcmemberspro_member_listings do |t|
+
+			t.string :mbcompanyname
+			t.string :mbcontactname
+			t.string :mbaddressl1
+			t.string :mbaddressl2
+			t.string :mbcity
+			t.string :mbprovince
+			t.string :mbcountry
+			t.string :mbpostalcode
+			t.string :mbphone
+			t.string :mbcontactemail
+			t.string :mbwebsite
+
+			t.references :profile
+
+			t.string :user_id
+			t.string :membership_id
+			t.string :oganization_id
+
+			t.timestamps
+
+		end
+	end
 end

data/db/migrate/20160728231036_create_phcmemberspro_member_profiles.rb

@@ -1,20 +1,20 @@
-class CreatePhcmembersproMemberProfiles < ActiveRecord::Migration[5.0]
-	def change
-		create_table :phcmemberspro_member_profiles do |t|
-
-			t.string :mfirstname
-			t.string :mlastname
-			t.string :mtitle
-			t.string :memail
-			t.string :mphone
-			t.string :mnotes
-
-			t.string :user_id
-			t.string :membership_id
-			t.string :oganization_id
-
-			t.timestamps
-
-		end
-	end
+class CreatePhcmembersproMemberProfiles < ActiveRecord::Migration[5.0]
+	def change
+		create_table :phcmemberspro_member_profiles do |t|
+
+			t.string :mfirstname
+			t.string :mlastname
+			t.string :mtitle
+			t.string :memail
+			t.string :mphone
+			t.string :mnotes
+
+			t.string :user_id
+			t.string :membership_id
+			t.string :oganization_id
+
+			t.timestamps
+
+		end
+	end
 end

data/lib/phcmemberspro/version.rb

@@ -1,3 +1,3 @@
 module Phcmemberspro
-	VERSION = "9.5.7"
+	VERSION = "9.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcmemberspro
 version: !ruby/object:Gem::Version
-  version: 9.5.7
+  version: 9.6.0
 platform: ruby
 authors:
 - BradPotts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -541,7 +541,6 @@ files:
 - app/assets/stylesheets/phcmemberspro/application.scss
 - app/controllers/phcmemberspro/application_controller.rb
 - app/controllers/phcmemberspro/directory/categories_controller.rb
-- app/controllers/phcmemberspro/directory/categorylistings_controller.rb
 - app/controllers/phcmemberspro/member/addresses_controller.rb
 - app/controllers/phcmemberspro/member/listings_controller.rb
 - app/controllers/phcmemberspro/member/profiles_controller.rb
@@ -571,8 +570,6 @@ files:
 - app/views/phcmemberspro/directory/categories/index.html.erb
 - app/views/phcmemberspro/directory/categories/new.html.erb
 - app/views/phcmemberspro/directory/categories/show.html.erb
-- app/views/phcmemberspro/directory/categorylistings/index.html.erb
-- app/views/phcmemberspro/directory/categorylistings/show.html.erb
 - app/views/phcmemberspro/member/addresses/_form.html.erb
 - app/views/phcmemberspro/member/addresses/components/_address_address.html.erb
 - app/views/phcmemberspro/member/addresses/components/_address_audits.html.erb

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

@@ -1,22 +0,0 @@
-require_dependency "phcmemberspro/application_controller"
-
-module Phcmemberspro
-	class Directory::CategorylistingsController < ApplicationController
-
-		# Security & Action Filters
-		before_action :require_user
-		before_action :membership_info
-		before_action :set_paper_trail_whodunnit
-		before_action :set_directory_category, only: [:show]
-
-		# INDEX - Directory Category/Listings
-		def index
-			@directory_categorylistings = Directory::Categorylisting.where(oganization_id: membership_info.org_id)
-		end
-
-		# DETAILED - Directory Category/Listings
-		def show
-		end
-
-	end
-end

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

@@ -1,60 +0,0 @@
-<!-- Title System -->
-<% phc_title "Directory Listing Manager" %>
-<% phc_title_tagline "Web Directory Listing Index" %>
-
-<!-- Page Header -->
-<div class="page-bar">
-	<!-- Bread Crumb -->
-	<ul class="page-breadcrumb">
-		<li><%= link_to "Dashboard", directory_root_path %><i class="fa fa-circle"></i></li>
-		<li class="active"><%= link_to "Directory Categories Index", directory_categories_path %><i class="fa fa-circle"></i></li>
-		<li class="active"><%= yield(:phc_title_tagline) %></li>
-	</ul>
-	<div class="page-toolbar">
-	</div>
-</div>
-<h1 class="page-title">
-	<%= yield(:phc_title) %>
-	<small><%= yield(:phc_title_tagline) %></small>
-</h1>
-
-<!-- Main Content -->
-<div class="row">
-	<div class="col-lg-12">
-
-		<div class="panel panel-default">
-			<div class="panel-heading">
-
-				<div class="caption">
-					<span class="caption-subject bold uppercase"><%= yield(:phc_title_tagline) %></span>
-				</div>
-
-			</div>
-			<div class="panel-body">
-
-				<div class="table-scrollable">
-					<table class="table table-striped table-bordered table-advance table-hover">
-	
-						<thead>
-							<tr>
-								<th>Category</th>
-								<th>Company Name</th>
-							</tr>
-						</thead>
-
-						<tbody>
-							<% @directory_categorylistings.each do |directory_categorylisting| %>
-								<tr>
-									<td><%= directory_categorylisting.category.catname %></td>
-									<td><%= directory_categorylisting.listing.mbcompanyname %></td>
-								</tr>
-							<% end %>
-						</tbody>
-
-					</table>
-				</div>
-			</div>
-		</div>
-
-	</div>
-</div>

data/app/views/phcmemberspro/directory/categorylistings/show.html.erb

@@ -1,4 +0,0 @@
-<p id="notice"><%= notice %></p>
-
-<%= link_to 'Edit', edit_directory_categorylisting_path(@directory_categorylisting) %> |
-<%= link_to 'Back', directory_categorylistings_path %>