effective_classifieds 0.4.11 → 0.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f03f965b89f0bf85f9aa3e719028222db5ce54a45d1cfe27404c1cce77f20ac0
-  data.tar.gz: fac5220170dfcf7ce73e3b59b912768842572281b8142e6f46ba5fd34f8ebe63
+  metadata.gz: 2d802fe2eac42d3af8f640f04c62dccbbe373562b72f17953f1f7628cb035516
+  data.tar.gz: de411167ca89c14a53a0c1f5e0da3180e9bbc7ef1bf1e23661cba0c41b08eaa2
 SHA512:
-  metadata.gz: e92522ded518276b104933226a139d73ffd6d7308c78fa2b212c06996cdc444f7e0a03836f171447d13256c838bbc99180589dffc4582e34be246c96049d9429
-  data.tar.gz: 86012d68e09487e01b305eac9da835a4710732a9c555e16dbdcbef2bb277a51a1ee3038160a653cf5dd7290bc849d3cd2d83f82cf0c6395c925e08a7cf94d35b
+  metadata.gz: 763605c34d15d43a3fbbd6e8709bfcdce16d7e914033c97e1ae2e4c8b51e1b64d287926ea847ea3ed5ce452e96507972b2fe0c6e559183388642c935799abb80
+  data.tar.gz: aa4bffcfe58593301ecfd435b6514f0e6e2662504cfab015a5a1137f48854c1852458991f45ecfd0896f4847f06a7f5230adade329254bfe2c1b55d0d8b9ec71

data/app/datatables/effective_classified_wizards_datatable.rb

@@ -21,11 +21,16 @@ class EffectiveClassifiedWizardsDatatable < Effective::Datatable
     actions_col(actions: []) do |wizard|
       if wizard.draft?
         dropdown_link_to('Continue', effective_classifieds.classified_wizard_build_path(wizard, wizard.next_step), 'data-turbolinks' => false)
-      else
+      elsif wizard.classified.present?
+        dropdown_link_to('Show', effective_classifieds.classified_path(wizard.classified))
         dropdown_link_to('Edit', effective_classifieds.edit_classified_path(wizard.classified))
+        dropdown_link_to('Show Wizard', effective_classifieds.classified_wizard_path(wizard), 'data-turbolinks' => false)
+      end
+
+      if EffectiveResources.authorized?(self, :destroy, wizard)
+        dropdown_link_to('Delete', effective_classifieds.classified_wizard_path(wizard), 'data-confirm': "Really delete #{wizard}?", 'data-method': :delete)
       end
 
-      dropdown_link_to('Delete', effective_classifieds.classified_wizard_path(wizard), 'data-confirm': "Really delete #{wizard}?", 'data-method': :delete)
     end
   end
 

data/app/models/effective/classified.rb

@@ -127,11 +127,11 @@ module Effective
       validates :phone, presence: true
     end
 
-    validate(if: -> { start_on.present? && end_on.present? }) do
+    validate(if: -> { start_on.present? && end_on.present? && !importing }) do
       self.errors.add(:end_on, 'must be after start date') if end_on < start_on
     end
 
-    validate(if: -> { start_on.present? && end_on.present? && EffectiveClassifieds.max_duration.present? }) do
+    validate(if: -> { start_on.present? && end_on.present? && EffectiveClassifieds.max_duration.present? && !importing }) do
       if (end_on - start_on) > EffectiveClassifieds.max_duration
         distance = ApplicationController.helpers.distance_of_time_in_words(end_on + EffectiveClassifieds.max_duration, end_on).gsub('about', '').strip
         self.errors.add(:end_on, "must be within #{distance} of start date")

data/lib/effective_classifieds/version.rb

@@ -1,3 +1,3 @@
 module EffectiveClassifieds
-  VERSION = '0.4.11'.freeze
+  VERSION = '0.4.13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_classifieds
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.13
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-10 00:00:00.000000000 Z
+date: 2023-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails