dcidev_approval 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0f4b607b87d0a4885cb7eed7fa8a669e82e9e6b2fb79f9af7fdf79410b1fcff
-  data.tar.gz: 24ce7542734d119282afc7241a14125c64e1f90000474986b79ea5321f308f66
+  metadata.gz: 113b68a6c6cc3aa09902b2ede950d44deaa4a3f9cfe8a72c4ab4e1a9051e5ca7
+  data.tar.gz: 489f1c91e45864e4d88ab12bd32dd34f9eafc1c1e381d9d8be92884703e7f316
 SHA512:
-  metadata.gz: 3ea5cf3de84456bb54c7452e61f871829aa6717325815dd6d153e030ee31a5e2c63db09cc93a9f5783b0630057b86af04bd6cf8dfad4e0165fd0a9f875e15bec
-  data.tar.gz: e5bee4b7d43226dad75d04ac0ba0b4fd6380d6b8d3bc1fd3f27ff8c98c4e951af61fab0f5725fabda1200eea61edf88c260b3811535b3f21f8b5a49f69700f19
+  metadata.gz: 6b59254605c479585ecd5289dfd6e1f41c15aa4cde5888a4c1f834633a1f56e13d04fe1570762507adf249411d11234e0aaf102bd13e150e9f2dfbe98c40aa98
+  data.tar.gz: c1af9bc61fb9ae9fc0ce9da4daef4b1c9dc44975f04a4a68ca07371f4109ea7c3569f508243ed8fd799c0cb0b354aa2b3e106f27083973ff9875b307bb5becd5

data/lib/dcidev_approval.rb

@@ -36,6 +36,18 @@ module DcidevApproval
       self.change_status == "pending_delete"
     end
 
+    def approved?
+      self.status == "approved"
+    end
+
+    def rejected?
+        self.status == "rejected"
+    end
+
+    def waiting?
+        self.status == "waiting"
+    end
+
     def last_modified_by
       # p self.audit_trail
       if self.try(:change_status).present? && self.try(:change_status) == 'pending_delete'
@@ -109,7 +121,7 @@ module DcidevApproval
           # ActivityLog.write("#{agent.is_admin? ? nil : "Request "}Edit #{self.class.to_s}", request, agent, menu, self) if params.log
         end
       end
-      yield self
+      yield true
     end
 
     def approval(params)
@@ -118,7 +130,7 @@ module DcidevApproval
       elsif params.status == "rejected"
         self.delete_changes
       end
-      yield self
+      yield true
     end
 
     def delete_data(agent, bypass = true)
@@ -143,15 +155,15 @@ module DcidevApproval
           data = params.merge!({ status: :approved })
           d = self.new_from_params(data)
           raise d.errors.full_messages.join(", ") unless d.save
-          yield d
           # ActivityLog.write("#{agent.is_admin? ? nil : "Request "} Add #{self.to_s}", request, agent, menu, d) if params.log
         end
       else
         d = self.new_from_params(params)
         d.status = agent.is_admin? ? :approved : :waiting
         raise d.errors.full_messages.join(", ") unless d.save
-        yield d
+        # ActivityLog.write("Add #{self.to_s}", request, agent, menu, d) if params.log
       end
+      yield d
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dcidev_approval
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Punto Damar P
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dcidev_active_record
@@ -33,10 +33,10 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/dcidev_approval.rb
-homepage:
+homepage: 
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -51,8 +51,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Logic for implementing record changes approval
 test_files: []