web47core 3.2.3.28 → 3.2.3.29

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0ae4e8d149eb528b642a281d596ce1d74a3be183c5c4f96973d18fe5feceea51
4
- data.tar.gz: b903d5e5875c61111150ead42469abb2ceaf12667d42125949eaf284e5c29661
3
+ metadata.gz: da5eed78b518a4431c3c388673c767af0fe35ca33395656d37515a369d97bed5
4
+ data.tar.gz: 5970b5bf1240b5672761df3509eb33b50191fc8ef28246aa471ce5b34c5f4303
5
5
  SHA512:
6
- metadata.gz: ab104e17e0c0780a4b8ae5d3359dfde29d5433e9e705105a5babdd515cddb059af97d9d5e8557288d42236e2945c6b15685d5739d60be5f39f56201bdb9098ee
7
- data.tar.gz: c8eeee3b4cc1a18a43f3076ed0601c7258481ef4a5b8316f88b12230b5ffb0e53573f7cc321ae6334ec4613b279e9572354f3ab0f24bf196008820da50ddae53
6
+ metadata.gz: 3cfbd7379b539f47a66b25103f1b94b6b3fa41be032fc596c94ef48485bfba803c89f5e47cf0346057ed71d028dd8ebf72e541f9de3a1be0faf5f9060b7d619a
7
+ data.tar.gz: b7e01bda72d4461e54881206ca07be39d37724cb5a9d8a909540e638439c1a983398e5f376e99606af7ee34080d57877e33df980d442f1f03ff9bd6483e4006a
@@ -5,17 +5,25 @@
5
5
  #
6
6
  module CoreApplicationHelper
7
7
  # @abstract Return the current user
8
- # @return [User] - The current user that is logged in
8
+ # @return [User, nil] - The current user that is logged in
9
9
  def current_user
10
10
  @current_user
11
11
  end
12
12
 
13
13
  # @abstract Return the current member
14
- # @return [Member] - The current user that is logged in
14
+ # @return [Member, nil] - The current user that is logged in
15
15
  def current_member
16
16
  @current_member
17
17
  end
18
18
 
19
+ # @abstract return the user or member depending on configuration
20
+ # @return [Member, User, nil]
21
+ def current_member_user
22
+ send("current_#{Web47core.audit_model}")
23
+ rescue StandardError
24
+ current_user || current_member
25
+ end
26
+
19
27
  # @abstract Return the referrer url without deleting it out of the session
20
28
  # @param [String] default_url - The URL to use if the referrer session is not there
21
29
  # @return [String] the session[:referrer] or the default_url if not found
@@ -47,7 +47,7 @@ module CoreDataGridHelper
47
47
  when Mongoid::Boolean
48
48
  value ? 'Yes' : 'No'
49
49
  when Date, DateTime, Time
50
- current_user.local_time(value, :medium)
50
+ current_member_user&.local_time(value, :medium) || value.to_s
51
51
  when Integer, Array
52
52
  value.to_s
53
53
  when String
@@ -17,7 +17,7 @@ module ApiTokenable
17
17
  # call back to reset the api token.
18
18
  before_save :assign_api_token, if: :reset_api_token
19
19
  # set the index on api token
20
- index({ api_token: 1 }, background: true)
20
+ index({ api_token: Mongo::Index::ASCENDING }, background: true)
21
21
 
22
22
  def cycle_api_token
23
23
  set api_token: SecureRandom.urlsafe_base64
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Web47core
4
- VERSION = '3.2.3.28'
4
+ VERSION = '3.2.3.29'
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: web47core
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.2.3.28
4
+ version: 3.2.3.29
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chris Schroeder
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2025-12-19 00:00:00.000000000 Z
11
+ date: 2025-12-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activemodel