Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
paranoia
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ikcrm_common
paranoia
Commits
55adceee
Commit
55adceee
authored
Sep 23, 2014
by
Georg Limbach
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix usage of paranoia_column in related models
refs
https://github.com/radar/paranoia/issues/102
parent
a57ce862
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
lib/paranoia.rb
+3
-3
No files found.
lib/paranoia.rb
View file @
55adceee
...
@@ -29,7 +29,7 @@ module Paranoia
...
@@ -29,7 +29,7 @@ module Paranoia
end
end
def
only_deleted
def
only_deleted
with_deleted
.
where
.
not
(
paranoia_column
=>
paranoia_sentinel_value
)
with_deleted
.
where
.
not
(
table_name
=>
{
paranoia_column
=>
paranoia_sentinel_value
}
)
end
end
alias
:deleted
:only_deleted
alias
:deleted
:only_deleted
...
@@ -180,9 +180,9 @@ class ActiveRecord::Base
...
@@ -180,9 +180,9 @@ class ActiveRecord::Base
include
Paranoia
include
Paranoia
class_attribute
:paranoia_column
,
:paranoia_sentinel_value
class_attribute
:paranoia_column
,
:paranoia_sentinel_value
self
.
paranoia_column
=
options
[
:column
]
||
:deleted_at
self
.
paranoia_column
=
(
options
[
:column
]
||
:deleted_at
).
to_s
self
.
paranoia_sentinel_value
=
options
.
fetch
(
:sentinel_value
)
{
Paranoia
.
default_sentinel_value
}
self
.
paranoia_sentinel_value
=
options
.
fetch
(
:sentinel_value
)
{
Paranoia
.
default_sentinel_value
}
default_scope
{
where
(
paranoia_column
=>
paranoia_sentinel_value
)
}
default_scope
{
where
(
table_name
=>
{
paranoia_column
=>
paranoia_sentinel_value
}
)
}
before_restore
{
before_restore
{
self
.
class
.
notify_observers
(
:before_restore
,
self
)
if
self
.
class
.
respond_to?
(
:notify_observers
)
self
.
class
.
notify_observers
(
:before_restore
,
self
)
if
self
.
class
.
respond_to?
(
:notify_observers
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment