Merge pull request #1467 from NYPL/elasticsearch-6.8_to_7.10

Fixed allowed user emails issue and fixed active checkbox alignment …
NYPL · Nov 27, 2024 · d5027ed · d5027ed
2 parents 743d4f9 + af98500
commit d5027ed
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/app/assets/stylesheets/active_admin_custom.scss b/app/assets/stylesheets/active_admin_custom.scss
@@ -71,7 +71,17 @@
     width: 16% !important;
     display: table-row-group;
   }
-
+
+  form fieldset > ol > li.boolean label[for="school_active"],
+  form fieldset > ol > li.boolean label[for="allowed_user_email_masks_active"] {
+    display: inline-flex;
+    align-items: center;
+    font-weight: bold;
+    margin-left: 0;
+    cursor: pointer;
+    padding-left: 16%;
+  }
+
   body.active_admin {
     #hold_change_cancel_action {
       margin-right: 10px;

diff --git a/app/models/allowed_user_email_masks.rb b/app/models/allowed_user_email_masks.rb
@@ -12,6 +12,11 @@ class AllowedUserEmailMasks < ActiveRecord::Base
   # Setup accessible (or protected) attributes for your model
   # attr_accessible :email_pattern, :active, :created_at, :updated_at
 
+  # Define searchable attributes for Ransack
+  def self.ransackable_attributes(auth_object = nil)
+    ["email_pattern", "active", "created_at", "updated_at"]  # List allowed fields here
+  end
+
   before_create :normalize_email_strings
   before_update :normalize_email_strings