effective_events 0.20.6 → 0.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fac59635c68fc7c14fdf1971a2a7b3cae0d2c5f2469e2c025d827b8d4c03428d
-  data.tar.gz: aa6ef8fa7bca306eedc5b4549c33561f08c384df90f7d57f7570f9d01b9a4919
+  metadata.gz: 128c897d8cc40cfd3f84fefb6b8eac69471d226ef6041620a47085a3262fad70
+  data.tar.gz: f872992f624a56532b1efbb74c3be72b226cc14a1920e8342e24a1ffd41f0775
 SHA512:
-  metadata.gz: a3911304d324505f653a369436933f57190427be6555abe84c576dc2ca8adbec7687ae8b923fb68b70b901d147eaa57b40a5265c6d1f52f60331f2e268605d56
-  data.tar.gz: cfddf6a3d9282f1bc8b6380825d00c89c7ee486d24c193b2cefe0891846d3a5f9a821b2a8d11024c42c7a6d9eb94a8492ba8d0e6c694ad8bb31715616ec36dc0
+  metadata.gz: 7a8202dbb17598290d7dd4b83c45f189f0d67ea754fd719a290ede35838a0450bae7afd48f446480ed25b8625a93668a51cef4f9b12f19672827ec42c4c1d63e
+  data.tar.gz: c14279553171ea9a133572f1077382b2ddb5ea10ed5366531969c1edbd16310f519174d270ae8ebab4317cd52bb207293aab9895be98c586b777c00bdd38613e

data/app/views/admin/event_addons/_form.html.haml

@@ -10,7 +10,7 @@
   - if f.object.new_record?
     -# User
     - klass = (f.object.owner || current_user).class
-    - ajax_url = (@select2_users_ajax_path || effective_resources.users_admin_select2_ajax_index_path) unless Rails.env.test?
+    - ajax_url = (effective_resources.users_effective_ajax_index_path unless Rails.env.test?)
 
     = f.hidden_field :owner_type, value: klass.name
     = f.select :owner_id, klass.all, ajax_url: ajax_url, label: 'User'

data/app/views/admin/event_registrants/_form.html.haml

@@ -9,7 +9,7 @@
   - if f.object.new_record?
     -# User
     - klass = (f.object.owner || current_user).class
-    - ajax_url = (effective_resources.users_admin_select2_ajax_index_path unless Rails.env.test?)
+    - ajax_url = (effective_resources.users_effective_ajax_index_path unless Rails.env.test?)
 
     = f.hidden_field :owner_type, value: klass.name
     = f.select :owner_id, klass.all, ajax_url: ajax_url, label: 'Registration User'

data/app/views/effective/event_registrants/_fields.html.haml

@@ -1,6 +1,6 @@
 .event-registrant-user-fields
   - user_klass = (f.object.user || current_user).class
-  - ajax_url = (effective_events.users_event_registrants_select2_ajax_index_path unless Rails.env.test?)
+  - ajax_url = (effective_resources.users_effective_ajax_index_path unless Rails.env.test?)
   - disabled = (f.object.user.present? && f.object.user.persisted? && f.object.user.errors.blank?)
   - event_ticket = f.object.event_ticket
 

data/app/views/effective/events/show.html.haml

@@ -40,11 +40,11 @@
               %br
               = @event.early_bird_end_at.strftime("%A, %B %d, %Y · %l:%M%P")
 
-          - if @event.registration_end_at.present?
-            %li.mb-3
-              %label Registration Closes
-              %br
-              = @event.registration_end_at.strftime("%A, %B %d, %Y · %l:%M%P")
+          -#- if @event.registration_end_at.present?
+          -#  %li.mb-3
+          -#    %label Registration Closes
+          -#    %br
+          -#    = @event.registration_end_at.strftime("%A, %B %d, %Y · %l:%M%P")
 
           -# .col-md-auto
           -#   - if @event.event_tickets.present?

data/config/routes.rb

@@ -24,11 +24,6 @@ EffectiveEvents::Engine.routes.draw do
         put :update_blank_registrants, on: :member
       end
     end
-
-    resources :event_registrants_select2_ajax, only: [] do
-      get :users, on: :collection
-      get :organizations, on: :collection
-    end
   end
 
   namespace :admin do

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.20.6'.freeze
+  VERSION = '0.21.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.20.6
+  version: 0.21.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-17 00:00:00.000000000 Z
+date: 2024-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -229,7 +229,6 @@ files:
 - app/controllers/admin/event_registrations_controller.rb
 - app/controllers/admin/event_tickets_controller.rb
 - app/controllers/admin/events_controller.rb
-- app/controllers/effective/event_registrants_select2_ajax_controller.rb
 - app/controllers/effective/event_registrations_controller.rb
 - app/controllers/effective/events_controller.rb
 - app/datatables/admin/effective_event_addons_datatable.rb

data/app/controllers/effective/event_registrants_select2_ajax_controller.rb

@@ -1,61 +0,0 @@
-module Effective
-  class EventRegistrantsSelect2AjaxController < ApplicationController
-    before_action(:authenticate_user!) if defined?(Devise)
-
-    include Effective::Select2AjaxController
-
-    def users
-      authorize! :users, Effective::EventRegistrant
-
-      with_organizations = current_user.class.try(:effective_memberships_organization_user?)
-
-      collection = current_user.class.all
-      collection = collection.includes(:organizations) if with_organizations
-
-      respond_with_select2_ajax(collection, skip_authorize: true) do |user|
-        data = { first_name: user.first_name, last_name: user.last_name, email: user.email }
-
-        if with_organizations
-          data[:company] = user.organizations.first.try(:to_s)
-          data[:organization_id] = user.organizations.first.try(:id)
-          data[:organization_type] = user.organizations.first.try(:class).try(:name)
-        end
-
-        { 
-          id: user.to_param, 
-          text: to_select2(user, with_organizations),
-          data: data
-        }
-      end
-    end
-
-    def organizations
-      raise('expected EffectiveEvents.organization_enabled?') unless EffectiveEvents.organization_enabled?
-
-      klass = EffectiveMemberships.Organization
-      raise('an EffectiveMemberships.Organization is required') unless klass.try(:effective_memberships_organization?)
-
-      collection = klass.all
-
-      # Authorize
-      EffectiveResources.authorize!(self, :member_organizations, collection.klass)
-
-      respond_with_select2_ajax(collection, skip_authorize: true) do |organization|
-        { id: organization.to_param, text: organization.to_s }
-      end
-    end
-
-    private
-
-    def to_select2(resource, with_organizations)
-      organizations = Array(resource.try(:organizations)).join(', ') if with_organizations
-
-      [
-        "<span>#{resource}</span>",
-        "<small>&lt;#{resource.try(:public_email).presence || resource.email}&gt;</small>",
-        ("<small>#{organizations}</small>" if organizations.present?)
-      ].compact.join(' ')
-    end
-
-  end
-end