cowtech-rails 1.7.9.0 → 1.8.0.0

data/app/helpers/cowtech/ruby_on_rails/helpers/crud_helper.rb

@@ -144,8 +144,8 @@ module Cowtech
           self.crud_query_initialize(data) unless data[:query_initialized]
           parameter = :search unless parameter
 
-          self.crud_query_add_condition(data, "(#{self.crud_get_class(data).table_name}.#{self.crud_get_class(data).deleted_column} = :deleted)", {:deleted => false}) unless data[:skip_deleted]
-          
+          self.crud_query_add_condition(data, "(#{self.crud_get_class(data).table_name}.#{self.crud_get_class(data).deleted_column} IS NULL)", {}) unless data[:skip_deleted]
+
           # GET QUERY
           args = params[parameter] unless args
 

data/app/models/cowtech/ruby_on_rails/models/model_base.rb

@@ -9,7 +9,7 @@ module Cowtech
     module Models
       class ModelBase < ::ActiveRecord::Base
         def self.deleted_column
-          "deleted"
+          "deleted_at"
         end
         
         def self.status_column
@@ -40,7 +40,7 @@ module Cowtech
           if !definitive then
             if self.deletable? then
               if self.has_attribute?(self.class.deleted_column) then
-                self.update_attribute(self.class.deleted_column, true)
+                self.update_attribute(self.class.deleted_column, DateTime.now)
                 true
               elsif self.has_attribute?(self.class.status_column) then
                 self.update_attribute(self.class.status_column, self.deleted_status)

data/lib/cowtech/version.rb

@@ -8,8 +8,8 @@ module Cowtech
   module Rails
     module Version
       MAJOR = 1
-      MINOR = 7
-      PATCH = 9
+      MINOR = 8
+      PATCH = 0
       BUILD = 0
 
       STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cowtech-rails
 version: !ruby/object:Gem::Version
-  version: 1.7.9.0
+  version: 1.8.0.0
   prerelease: 
 platform: ruby
 authors: