web47core 1.0.8 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b7fe306fd542b3f2f2c35c4d8fabbcc625cae18db9c9424b0eef5134a7167da
-  data.tar.gz: 4ab1d0fd7b51336c08af3b7a38349830872f41e979f786621288e0b16c4b0e58
+  metadata.gz: ef5eb2bf315d0be4a596a440d855e049ce11ebd0834d9598c81ae674551fd9d5
+  data.tar.gz: 833d99f9b33348a8d4b9a61584d61cd6dae5d9a1b44a0d4b3046b48b68369f7d
 SHA512:
-  metadata.gz: 28e7320bb0bc526582605f3160047a06eeb86280bdb384556b1ddc067c0e04cd539ea8691da6472df804193b3a642002b53fb74bcdfcc4dec878670f9cbf3549
-  data.tar.gz: 2bf17be859310206cdb2b59ae587d304a07f239be637d1de058874b0826df3e6d8cbc1a1644eefb29752fc81af319819503689bb773f4317cd19a7505254e6b4
+  metadata.gz: 9b84594fa18bf1f612fb4312002c1b9913b8d3ae70d3848f1c612b858fc3a808a33759d82ffd79f8e9011e5e063d11833917d96a05d7a795dfef4529f08d8ca8
+  data.tar.gz: cebbbc92c09cd7459fcc1ea2c6f087fff240e8c1eb74b339206b36e6f1297d59e957a0906be3fd087a4a1e473ca9d650dc8edec5c806489e692732e403fa8114

data/app/helpers/core_form_helper.rb

@@ -21,12 +21,12 @@ module CoreFormHelper
     # tag_options = {class: []} # text_field_options(model, field, options)
     # tag_options[:class] += ['materialize-textarea']
     content_tag(:div, class: (%w[input-field col] + classes).join(' ')) do
-      concat(text_area(model, field, value, options))
+      concat(text_area_tag(model, field, value, options))
       concat(form_label_tag(model, field, value, options))
     end
   end
 
-  def text_area(model, field, value, options = {})
+  def text_area_tag(model, field, value, options = {})
     tag_options = text_field_options(model, field, options)
     tag_options[:class] += ['materialize-textarea']
     content_tag(:textarea, tag_options) do

data/app/helpers/core_link_helper.rb

@@ -97,7 +97,8 @@ module CoreLinkHelper
     return unless can? :edit, obj
 
     icon = options[:icon] || 'edit'
-    content_tag(:a, href: path) do
+    tooltip = options[:tooltip] || 'Edit'
+    content_tag(:a, href: path, class: 'tooltipped', data: {tooltip: tooltip}) do
       concat(content_tag(:i, class: 'material-icons') do
         icon
       end)

data/lib/app/controllers/concerns/core_delayed_jobs_controller.rb

@@ -10,7 +10,7 @@ module CoreDelayedJobsController
   #
   def index
     authorize! :read, Delayed::Backend::Mongoid::Job
-    @delayed_jobs = Delayed::Backend::Mongoid::Job.asc(%i[priority run_at]).limit(100)
+    @delayed_jobs = Delayed::Backend::Mongoid::Job.asc(%i[locked_by priority run_at]).limit(100)
   end
 
   def show

data/lib/app/jobs/cron/server.rb

@@ -185,7 +185,7 @@ module Cron
     # Returns the AutoScalingGroup associated with the account
     #
     def auto_scaling_group
-      filter = { auto_scaling_group_names: [sys_config.auto_scaling_group_name] }
+      filter = { auto_scaling_group_names: [sys_config.aws_auto_scaling_group_name] }
       @auto_scaling_group ||= client.describe_auto_scaling_groups(filter).auto_scaling_groups.first
     end
 

data/lib/app/jobs/cron/trim_collection.rb

@@ -31,12 +31,19 @@ module Cron
     # Test if this should be archived
     #
     def archive?(item)
-      item.updated_at < allowed_time_for_item(item)
+      item.send(comparison_field) < allowed_time_for_item(item)
     rescue StandardError => error
       App47Logger.log_warn "Unable to archive item #{item.inspect}", error
       false
     end
 
+    #
+    # Return which field to use for comparison when trimming objects
+    #
+    def comparison_field
+      :updated_at
+    end
+
     #
     # Try to get a TTL from System configuration, otherwise return the default
     #

data/lib/app/models/concerns/standard_model.rb

@@ -312,6 +312,7 @@ module StandardModel
   #
   def log_deletion(user, model)
     Web47core::Config.audit_model_log_class.create!(Web47core::Config.audit_model => user,
+                                                    deleted_oid: model.id,
                                                     model: model,
                                                     action: AuditLog::DELETE_ACTION,
                                                     changed_values: App47Logger.clean_params(attributes).to_json)

data/lib/app/models/notification.rb

@@ -233,6 +233,15 @@ class Notification
     result
   end
 
+  #
+  # Titleize the type of this notification as its name
+  #
+  def name
+    _type.titleize
+  rescue StandardError
+    _type
+  end
+
   private
 
   #

data/lib/app/models/user_model_audit_log.rb

@@ -8,6 +8,7 @@ class UserModelAuditLog < UserAuditLog
   # Fields
   #
   field :changed_values, type: String
+  field :deleted_oid, type: BSON::ObjectId
   #
   # Relationships
   #

data/lib/web47core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Web47core
-  VERSION = '1.0.8'
+  VERSION = '1.0.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.14
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-28 00:00:00.000000000 Z
+date: 2020-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport