phcmemberspro 32.0.0 → 33.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (14) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/phcmemberspro/application_controller.rb +0 -23
  3. data/app/controllers/phcmemberspro/directory/categories_controller.rb +2 -8
  4. data/app/controllers/phcmemberspro/member/addresses_controller.rb +3 -8
  5. data/app/controllers/phcmemberspro/member/listings_controller.rb +9 -12
  6. data/app/controllers/phcmemberspro/member/profiles_controller.rb +5 -8
  7. data/db/migrate/20160728230720_create_phcmemberspro_directory_categories.rb +1 -3
  8. data/db/migrate/20160728230830_create_phcmemberspro_directory_categorylistings.rb +1 -3
  9. data/db/migrate/20160728230901_create_phcmemberspro_member_addresses.rb +1 -3
  10. data/db/migrate/20160728231011_create_phcmemberspro_member_listings.rb +1 -3
  11. data/db/migrate/20160728231036_create_phcmemberspro_member_profiles.rb +1 -3
  12. data/db/migrate/20170517064049_create_phcmemberspro_listing_versions.rb +1 -0
  13. data/lib/phcmemberspro/version.rb +1 -1
  14. metadata +2 -16
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0db152bbcd047ab4c21af5229576467752241449
4
- data.tar.gz: b4f3040eb9d12b79740101131f97c7958d9bec99
3
+ metadata.gz: 1047cd58d8b749707590db90888ee958f5a7b980
4
+ data.tar.gz: aab48a379b3e1b214dd69f3dd5aa281299e37af1
5
5
  SHA512:
6
- metadata.gz: 4d98bf692d36f052d9fb35f8eefd0bc5b5773df76078b3bb256f67ab6af91ad89bedeb80c699f0fc00e44a32edf3ebebaa4b10d5070a1e97f56cd95a37a18842
7
- data.tar.gz: 553a2875cc430aa65aff211586ca39da5fd5b2890e355d621ee1c4cca21f2d9fa4a92ae63b6dbc2fcf1e3a65bfcb447d32f1257ad52f55e86be62fdca20ab262
6
+ metadata.gz: '08ce98c13d25fb76a32cf4727553562d937ae103106d759f83a3eb36a4354dc5307c2d05c193371c9749141970ae47223c544ff2537322bae9cb16d2e846dbe8'
7
+ data.tar.gz: 39af1291377d284e631be089c53bb91b9517dc4171cd124c188a0587f6d1e891a79b0b2f8634c2ea4c1afef636a54a3d605fd7d1210e6629b71639778d99baef
data/app/controllers/phcmemberspro/application_controller.rb CHANGED
@@ -9,29 +9,6 @@ module Phcmemberspro
9
9
  helper Phcnotifi::Engine.helpers
10
10
  helper Phcaccountspro::Engine.helpers
11
11
 
12
- # AuthRocket Definitions
13
- def require_user
14
- unless current_user
15
- params.permit!
16
- session[:last_url] = request.get? ? url_for(params) : url_for
17
- redirect_to new_login_url
18
- end
19
- end
20
-
21
- def current_user
22
- @_current_user ||= AuthRocket::Session.from_token(session[:ar_token]).try(:user)
23
- end
24
- helper_method :current_user
25
-
26
- def new_login_url
27
- ENV['AUTHROCKET_LOGIN_URL']
28
- end
29
- helper_method :new_login_url
30
-
31
- def authrocket_membership_info
32
- AuthRocket::Membership.all(user_id: current_user.id).first
33
- end
34
-
35
12
  # Papertrail Whodunnit Username
36
13
  def user_for_paper_trail
37
14
  # Default is: current_user rescue nil
data/app/controllers/phcmemberspro/directory/categories_controller.rb CHANGED
@@ -4,8 +4,7 @@ module Phcmemberspro
4
4
  class Directory::CategoriesController < ApplicationController
5
5
 
6
6
  # Security & Action Filters
7
- before_action :require_user
8
- before_action :authrocket_membership_info
7
+ before_action :authenticate_user!
9
8
  before_action :set_paper_trail_whodunnit
10
9
  before_action :set_directory_category, only: [:show, :edit, :update, :destroy]
11
10
 
@@ -23,6 +22,7 @@ module Phcmemberspro
23
22
  # NEW - Directory Category
24
23
  def new
25
24
  @directory_category = Directory::Category.new
25
+ @directory_category.user_id = current_user.id
26
26
  end
27
27
 
28
28
  # EDIT - Directory Category
@@ -33,9 +33,6 @@ module Phcmemberspro
33
33
  def create
34
34
  @directory_category = Directory::Category.new(directory_category_params)
35
35
  @directory_category.user_id = current_user.id
36
- @directory_category.user_name = current_user.username
37
- @directory_category.membership_id = authrocket_membership_info.id
38
- @directory_category.oganization_id = authrocket_membership_info.org_id
39
36
  if @directory_category.save
40
37
  redirect_to directory_categories_url, notice: 'Category was successfully created.'
41
38
  else
@@ -46,9 +43,6 @@ module Phcmemberspro
46
43
  # PATCH/PUT - Directory Category
47
44
  def update
48
45
  @directory_category.user_id = current_user.id
49
- @directory_category.user_name = current_user.username
50
- @directory_category.membership_id = authrocket_membership_info.id
51
- @directory_category.oganization_id = authrocket_membership_info.org_id
52
46
  if @directory_category.update(directory_category_params)
53
47
  redirect_to directory_categories_url, notice: 'Category was successfully updated.'
54
48
  else
data/app/controllers/phcmemberspro/member/addresses_controller.rb CHANGED
@@ -4,8 +4,7 @@ module Phcmemberspro
4
4
  class Member::AddressesController < ApplicationController
5
5
 
6
6
  # Security & Action Filters
7
- before_action :require_user
8
- before_action :authrocket_membership_info
7
+ before_action :authenticate_user!
9
8
  before_action :set_paper_trail_whodunnit
10
9
  before_action :get_member_profile_info
11
10
  before_action :set_member_address, only: [:show, :edit, :update, :destroy]
@@ -38,9 +37,7 @@ module Phcmemberspro
38
37
  @profile = Member::Profile.find(params[:profile_id])
39
38
  @member_address = @profile.addresses.create(member_address_params)
40
39
  @member_address.user_id = current_user.id
41
- @member_address.user_name = current_user.username
42
- @member_address.membership_id = authrocket_membership_info.id
43
- @member_address.oganization_id = authrocket_membership_info.org_id
40
+ @member_address.org_id = current_user.org_id
44
41
  if @member_address.save
45
42
  redirect_to member_profile_addresses_url, notice: 'Listing was successfully created.'
46
43
  else
@@ -51,9 +48,7 @@ module Phcmemberspro
51
48
  # PATCH/PUT - Directory Listings
52
49
  def update
53
50
  @member_address.user_id = current_user.id
54
- @member_address.user_name = current_user.username
55
- @member_address.membership_id = authrocket_membership_info.id
56
- @member_address.oganization_id = authrocket_membership_info.org_id
51
+ @member_address.org_id = current_user.org_id
57
52
  if @member_address.update(member_address_params)
58
53
  redirect_to member_profile_addresses_url, notice: 'Listing was successfully updated.'
59
54
  else
data/app/controllers/phcmemberspro/member/listings_controller.rb CHANGED
@@ -3,12 +3,11 @@ require_dependency "phcmemberspro/application_controller"
3
3
  module Phcmemberspro
4
4
  class Member::ListingsController < ApplicationController
5
5
 
6
- # Security & Action Filters
7
- before_action :require_user
8
- before_action :authrocket_membership_info
9
- before_action :set_paper_trail_whodunnit
10
- before_action :get_member_profile_info
11
- before_action :set_member_listing, only: [:show, :edit, :update, :destroy]
6
+ # Security & Action Filters
7
+ before_action :authenticate_user!
8
+ before_action :set_paper_trail_whodunnit
9
+ before_action :get_member_profile_info
10
+ before_action :set_member_listing, only: [:show, :edit, :update, :destroy]
12
11
 
13
12
  # INDEX - Directory Listings
14
13
  def index
@@ -27,6 +26,8 @@ module Phcmemberspro
27
26
  def new
28
27
  profile = Member::Profile.find(params[:profile_id])
29
28
  @member_listing = profile.listings.build
29
+ @member_listing.user_id = current_user.id
30
+ @member_listing.org_id = current_user.org_id
30
31
  end
31
32
 
32
33
  # EDIT - Directory Listings
@@ -38,9 +39,7 @@ module Phcmemberspro
38
39
  @profile = Member::Profile.find(params[:profile_id])
39
40
  @member_listing = @profile.listings.create(member_listing_params)
40
41
  @member_listing.user_id = current_user.id
41
- @member_listing.user_name = current_user.username
42
- @member_listing.membership_id = authrocket_membership_info.id
43
- @member_listing.oganization_id = authrocket_membership_info.org_id
42
+ @member_listing.org_id = current_user.org_id
44
43
  if @member_listing.save
45
44
  @member_listing.categorylistings.build
46
45
  redirect_to member_profile_listings_url, notice: 'Listing was successfully created.'
@@ -52,9 +51,7 @@ module Phcmemberspro
52
51
  # PATCH/PUT - Directory Listings
53
52
  def update
54
53
  @member_listing.user_id = current_user.id
55
- @member_listing.user_name = current_user.username
56
- @member_listing.membership_id = authrocket_membership_info.id
57
- @member_listing.oganization_id = authrocket_membership_info.org_id
54
+ @member_listing.org_id = current_user.org_id
58
55
  if @member_listing.update(member_listing_params)
59
56
  @member_listing.categorylistings.build
60
57
  redirect_to member_profile_listings_url, notice: 'Listing was successfully updated.'
data/app/controllers/phcmemberspro/member/profiles_controller.rb CHANGED
@@ -4,8 +4,7 @@ module Phcmemberspro
4
4
  class Member::ProfilesController < ApplicationController
5
5
 
6
6
  # Security & Action Filters
7
- before_action :require_user
8
- before_action :authrocket_membership_info
7
+ before_action :authenticate_user!
9
8
  before_action :set_paper_trail_whodunnit
10
9
  before_action :set_member_profile, only: [:show, :edit, :update, :destroy]
11
10
 
@@ -22,6 +21,8 @@ module Phcmemberspro
22
21
 
23
22
  # NEW FORM - Member Profile
24
23
  def new
24
+ @member_profile.user_id = current_user.id
25
+ @member_profile.org_id = current_user.org_id
25
26
  @member_profile = Member::Profile.new
26
27
  end
27
28
 
@@ -33,9 +34,7 @@ module Phcmemberspro
33
34
  def create
34
35
  @member_profile = Member::Profile.new(member_profile_params)
35
36
  @member_profile.user_id = current_user.id
36
- @member_profile.user_name = current_user.username
37
- @member_profile.membership_id = authrocket_membership_info.id
38
- @member_profile.oganization_id = authrocket_membership_info.org_id
37
+ @member_profile.org_id = current_user.org_id
39
38
  if @member_profile.save
40
39
  redirect_to member_profiles_url, notice: 'Profile was successfully created.'
41
40
  else
@@ -46,9 +45,7 @@ module Phcmemberspro
46
45
  # PATCH/PUT - Member Profile
47
46
  def update
48
47
  @member_profile.user_id = current_user.id
49
- @member_profile.user_name = current_user.username
50
- @member_profile.membership_id = authrocket_membership_info.id
51
- @member_profile.oganization_id = authrocket_membership_info.org_id
48
+ @member_profile.org_id = current_user.org_id
52
49
  if @member_profile.update(member_profile_params)
53
50
  redirect_to member_profiles_url, notice: 'Profile was successfully updated.'
54
51
  else
data/db/migrate/20160728230720_create_phcmemberspro_directory_categories.rb CHANGED
@@ -7,9 +7,7 @@ class CreatePhcmembersproDirectoryCategories < ActiveRecord::Migration[5.1]
7
7
  t.string :slug
8
8
 
9
9
  t.string :user_id
10
- t.string :user_name
11
- t.string :membership_id
12
- t.string :oganization_id
10
+ t.string :org_id
13
11
 
14
12
  t.timestamps
15
13
 
data/db/migrate/20160728230830_create_phcmemberspro_directory_categorylistings.rb CHANGED
@@ -8,9 +8,7 @@ class CreatePhcmembersproDirectoryCategorylistings < ActiveRecord::Migration[5.1
8
8
  t.string :slug
9
9
 
10
10
  t.string :user_id
11
- t.string :user_name
12
- t.string :membership_id
13
- t.string :oganization_id
11
+ t.string :org_id
14
12
 
15
13
  t.timestamps
16
14
 
data/db/migrate/20160728230901_create_phcmemberspro_member_addresses.rb CHANGED
@@ -15,9 +15,7 @@ class CreatePhcmembersproMemberAddresses < ActiveRecord::Migration[5.1]
15
15
  t.string :slug
16
16
 
17
17
  t.string :user_id
18
- t.string :user_name
19
- t.string :membership_id
20
- t.string :oganization_id
18
+ t.string :org_id
21
19
 
22
20
  t.timestamps
23
21
 
data/db/migrate/20160728231011_create_phcmemberspro_member_listings.rb CHANGED
@@ -19,9 +19,7 @@ class CreatePhcmembersproMemberListings < ActiveRecord::Migration[5.1]
19
19
  t.string :slug
20
20
 
21
21
  t.string :user_id
22
- t.string :user_name
23
- t.string :membership_id
24
- t.string :oganization_id
22
+ t.string :org_id
25
23
 
26
24
  t.timestamps
27
25
 
data/db/migrate/20160728231036_create_phcmemberspro_member_profiles.rb CHANGED
@@ -12,9 +12,7 @@ class CreatePhcmembersproMemberProfiles < ActiveRecord::Migration[5.1]
12
12
  t.string :slug
13
13
 
14
14
  t.string :user_id
15
- t.string :user_name
16
- t.string :membership_id
17
- t.string :oganization_id
15
+ t.string :org_id
18
16
 
19
17
  t.timestamps
20
18
 
data/db/migrate/20170517064049_create_phcmemberspro_listing_versions.rb CHANGED
@@ -10,6 +10,7 @@ class CreatePhcmembersproListingVersions < ActiveRecord::Migration[5.1]
10
10
  t.text :object, limit: TEXT_BYTES
11
11
  t.datetime :created_at
12
12
  end
13
+
13
14
  add_index :phcmemberspro_listing_versions, %i(item_type item_id), :name => 'mempro_listing_versions'
14
15
 
15
16
  end
data/lib/phcmemberspro/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Phcmemberspro
2
- VERSION = "32.0.0"
2
+ VERSION = "33.0.0"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: phcmemberspro
3
3
  version: !ruby/object:Gem::Version
4
- version: 32.0.0
4
+ version: 33.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - BradPotts
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-10-08 00:00:00.000000000 Z
11
+ date: 2017-10-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: paper_trail
@@ -58,20 +58,6 @@ dependencies:
58
58
  - - ">="
59
59
  - !ruby/object:Gem::Version
60
60
  version: 5.1.4
61
- - !ruby/object:Gem::Dependency
62
- name: phcaccountspro
63
- requirement: !ruby/object:Gem::Requirement
64
- requirements:
65
- - - "~>"
66
- - !ruby/object:Gem::Version
67
- version: '14.0'
68
- type: :runtime
69
- prerelease: false
70
- version_requirements: !ruby/object:Gem::Requirement
71
- requirements:
72
- - - "~>"
73
- - !ruby/object:Gem::Version
74
- version: '14.0'
75
61
  - !ruby/object:Gem::Dependency
76
62
  name: bootstrap-sass
77
63
  requirement: !ruby/object:Gem::Requirement