effective_memberships 0.15.0 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcacbcc7726096bc1fc69dafc09a496b4ba8f785117993b0df13efe44436a84f
-  data.tar.gz: 89242751748bdac6d8c84c7eed6c2d507b90c8939b090dd0d9ea44fe4c72368f
+  metadata.gz: 80b3be5df02d20bffe856bbfead08ca00bbbe1275de73180222c4d5b68325905
+  data.tar.gz: e446910960afadbc36f2f427e9bfdd5e5e286a1f59681ea523f15cd30e9da5ac
 SHA512:
-  metadata.gz: 595711508e4003185f62c09abe28f31639aeaf02377e088a96edff74dc4f99e6dbe6490aacc2dc279f1a1040f8b321786b9d595e93c129e39bed5f1c3c605cbf
-  data.tar.gz: aad625e963199c4a01612e925885fd5ce04acafb0290d113f98357d32ba5b2c84b3963cbc1d7775826b5668c68a1944d2d65bea9c9bfbe09661fe3b75858e6b5
+  metadata.gz: 5e7fbe089ca906197c0fd7a6823b0100c60d0ac2b084ee9f6a77e5d0ee2e82de81be3ab2aaf356c58b9dfc220b2d6c26dc8e4c0157d7d1b7c83ac18f7f79e4dc
+  data.tar.gz: b1305d1884b8a6c6f9bd67bfa5dcba9aa223caf22e11e961a85ff4c24f3d285d56dab1279ec1627ed7f4d0b64ae82147cab390454980cc48499902e553b5180a

data/app/models/effective/applicant_course.rb

@@ -33,7 +33,7 @@ module Effective
     end
 
     def to_s
-      title || 'course'
+      title.presence || model_name.human
     end
 
   end

data/app/models/effective/applicant_course_area.rb

@@ -24,7 +24,7 @@ module Effective
     validates :title, presence: true, uniqueness: true
 
     def to_s
-      title || 'course area'
+      title.presence || model_name.human
     end
 
   end

data/app/models/effective/applicant_course_name.rb

@@ -22,7 +22,7 @@ module Effective
     validates :position, presence: true
 
     def to_s
-      title || 'course name'
+      title.presence || model_name.human
     end
 
   end

data/app/models/effective/applicant_education.rb

@@ -28,7 +28,7 @@ module Effective
     end
 
     def to_s
-      degree_obtained || 'education'
+      degree_obtained.presence || model_name.human
     end
 
   end

data/app/models/effective/applicant_endorsement.rb

@@ -16,7 +16,6 @@ module Effective
     belongs_to :applicant, polymorphic: true
     belongs_to :endorser, polymorphic: true, optional: true
 
-
     effective_resource do
       # These fields are submitted by the applicant
       # They should try to select an endorser from the dropdown
@@ -82,7 +81,11 @@ module Effective
     end
 
     def to_s
-      'endorsement'
+      if (endorser.present? || name.present?)
+        "#{model_name.human} from #{endorser || name}"
+      else
+        model_name.human
+      end
     end
 
     def email

data/app/models/effective/applicant_equivalence.rb

@@ -25,7 +25,7 @@ module Effective
     end
 
     def to_s
-      name || 'equivalence'
+      name.present? ? "#{model_name.human} from #{name}" : model_name.human
     end
 
   end

data/app/models/effective/applicant_experience.rb

@@ -46,7 +46,7 @@ module Effective
     end
 
     def to_s
-      position.presence || 'work experience'
+      position.presence || model_name.human
     end
 
     def assign_months!

data/app/models/effective/applicant_reference.rb

@@ -72,7 +72,7 @@ module Effective
     after_commit(on: :create, if: -> { applicant.was_submitted? && !applicant.done? }, unless: -> { email_form_skip }) { notify! }
 
     def to_s
-      name.presence || 'reference'
+      name.present? ? "#{model_name.human} from #{name}" : model_name.human
     end
 
     def notify!

data/app/models/effective/membership.rb

@@ -129,7 +129,7 @@ module Effective
     end
 
     def to_s
-      return 'membership' if owner.blank?
+      return model_name.human if owner.blank?
 
       summary = [
         owner.to_s,

data/app/models/effective/membership_category.rb

@@ -6,7 +6,7 @@ module Effective
     log_changes(to: :membership) if respond_to?(:log_changes)
 
     def to_s
-      category&.to_s || 'membership category'
+      category&.to_s || model_name.human
     end
 
   end

data/app/models/effective/membership_history.rb

@@ -38,7 +38,7 @@ module Effective
     end
 
     def to_s
-      'membership history'
+      model_name.human
     end
 
     # These two accessors are for the memberships history form.

data/app/models/effective/membership_status.rb

@@ -6,7 +6,7 @@ module Effective
     log_changes(to: :membership) if respond_to?(:log_changes)
 
     def to_s
-      status&.to_s || 'membership status'
+      status&.to_s || model_name.human
     end
 
   end

data/app/models/effective/representative.rb

@@ -41,7 +41,7 @@ module Effective
       uniqueness: { scope: [:organization_id, :organization_type], message: 'already belongs to this organization' }
 
     def to_s
-      user.to_s
+      user&.to_s || model_name.human
     end
 
     def build_user(attributes = {})

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.15.0'
+  VERSION = '0.15.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-19 00:00:00.000000000 Z
+date: 2023-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails