web47core 1.0.10 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9622e0a6af565d04a9632845a6b6800bfb5b81d14d7d5a553827dc97b3eac30e
-  data.tar.gz: e44feb61e1103d7e3abec6a0498f4d9b2cbf691d38a638a350a1cc5162139811
+  metadata.gz: 20fa4ad255499f3d899ca64125951b60e7502d5e129f4989680bf84182e3671c
+  data.tar.gz: c47a90846316d62d4e63bf9f198912806c637f3a586b2b5441c0962ec22ce9b5
 SHA512:
-  metadata.gz: 2f5cabb03ecd3a26f650093aa3724b4adef50c484e9c20fad24cad95b6edbc1d5b6782611dfa3938e221c376a1699bbf4915ddefcfdfb66e1a614e576c65b64e
-  data.tar.gz: 7bcd7542a8a4f7042f4077538df3f83b12a59b934e41180befaa40614da9b2872bec565aabd194d443f523ab2242ebf166b1432be7c4eda609f1ec94209c7bf2
+  metadata.gz: f2e502d727e5b177adf2a4b22d09ab54f0281b4f0fa2106d4f1dbf18064f10e2c99d0644d99e96e6d44468a5a35c5918ae3ec2c164db8a782195d22419c230a8
+  data.tar.gz: 9b9ae4ea919b1f63a87bc144f9db10a65e047fbca2f28517b0eaf3ef2c4ea510d6b595931d65e1e845dd8f32e940fea07227adc75dc7c4bdfccd0c98498765c6

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/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/jobs/cron/trim_notifications.rb

@@ -28,7 +28,7 @@ module Cron
       time = if item.is_a?(EmailNotification) && template?(item)
                5.years.ago.utc
              else
-               allowed_time
+               allowed_time_for_item(item)
              end
       item.updated_at < time
     end

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

@@ -68,8 +68,10 @@ module CoreSystemConfiguration
       field :switchboard_stack_id, type: String
       field :switchboard_stack_api_token, type: String
       field :switchboard_last_sync_at, type: Time
-      # Audit Logs TTL
+      # TTLs
       field :user_model_audit_log_ttl, type: Integer, default: 365
+      field :slack_notification_ttl, type: Integer, default: 5
+      field :email_notification_ttl, type: Integer, default: 180
       #
       # Validations
       #

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.10'
+  VERSION = '1.0.15'
 end

metadata

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