effective_memberships 0.6.12 → 0.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f653de8b05ce80ba04ef7753b66ba37f3e4e47c1e5716bcc35ce309aa8202df0
-  data.tar.gz: c57dbe090a81aac7c96ba2050143e23d9cdc30ea9af601495be96142cf4a430f
+  metadata.gz: 58da6947ec96b076bd125a190e31ade30e7964b6dc796423dc7387efa156a246
+  data.tar.gz: 5805aa420a911f2abbb4d38ceaf1d6d743a3932e3b47a14b3b1e4a8796afd0bd
 SHA512:
-  metadata.gz: bff3a9c5f5a68e5725b7c2d3e2d427fd8deb9282fed0863554a62be18c6215d7ddb7eaea72d172ab4d62cf81eb2f763766cde06177b71fb4b01cf2f264b7e399
-  data.tar.gz: 7d3e1041de63cbcca640c12d6f0305211d9142316a7da0c83edf4286ed1776fa16bc36a332d46a09895c4806acccda01c13f4ea7c150fce2cddc968719862e49
+  metadata.gz: ea84383f2dbd0763c31e4c8a1c13f16d474d96e749502717dec4825cdbd50eee9fe3dbf3572650dcccedc3f05785bc283c0451fd9ac51fee5f17fd7fa738e7b6
+  data.tar.gz: f0d0dad74b75782b25fc76f786b6e1d042faa591941ebc747ac85d24301dda54e8d3fc5be080ef5827ac251de0f60d23eafea443106565fb872fd2ccdb9bf1a6

data/app/models/concerns/effective_memberships_applicant.rb

@@ -292,6 +292,21 @@ module EffectiveMembershipsApplicant
 
         self.errors.add(:applicant_endorsements, "please include #{required} or more endorsements") if existing < required
       end
+
+      validate do
+        endorsements = applicant_endorsements().reject(&:marked_for_destruction?)
+
+        duplicates = endorsements.select do |endorsement|
+          (endorsements - [endorsement]).find do |existing|
+            (endorsement.endorser.present? && endorsement.endorser == existing.endorser)
+          end.present?
+        end
+
+        if duplicates.present?
+          self.errors.add(:applicant_endorsements, "cannot use the same endorser more than once")
+          duplicates.each { |dup| dup.errors.add(:endorser_id, "has already been included") }
+        end
+      end
     end
 
     # Applicant Equivalences Step

data/app/views/admin/applicants/_form_applicant.html.haml

@@ -51,6 +51,6 @@
     = tab 'Other Applications' do
       = render_datatable(Admin::EffectiveApplicantsDatatable.new(user: applicant.owner, except_id: applicant.id))
 
-  - if applicant.persisted? && applicant.respond_to?(:log_changes_datatable)
+  - if applicant.persisted? && applicant.respond_to?(:logs_datatable)
     = tab 'Logs' do
-      = render_inline_datatable(applicant.log_changes_datatable)
+      = render_datatable(applicant.logs_datatable, inline: true, namespace: :admin)

data/app/views/effective/applicants/_summary.html.haml

@@ -29,7 +29,7 @@
           %td
             Joined on #{membership.joined_on.strftime('%F')}
             - if membership.reregistered?
-              and last changed on #{membership.reregistered_on.strftime('%F')}
+              and last changed on #{membership.registration_on.strftime('%F')}
 
             = collapse('show more', card_class: '') do
               %p #{applicant.owner} membership history

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.6.12'
+  VERSION = '0.6.13'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.6.12
+  version: 0.6.13
 platform: ruby
 authors:
 - Code and Effect