Merge pull request #5 from davidastephens/sync-upstream

Sync upstream
davidastephens · Sep 7, 2021 · a96e39b · a96e39b
2 parents 5259b46 + ff20ea8
commit a96e39b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGES b/CHANGES
@@ -8,6 +8,7 @@ CHANGELOG
 - Fix attribute error when union queryset of safe delete model with others #152 
 - SET related objects after deleting #156
 - Avoiding recursive call for delete function. #121
+- Add SAFE_DELETE_FIELD_NAME setting #164
 
 1.0.0 (2021-02-15)
 ==================

diff --git a/README.rst b/README.rst
@@ -116,7 +116,8 @@ In the main django settings you can activate the boolean variable ``SAFE_DELETE_
 If you do this the ``update_or_create()`` function from django's standard manager class will return ``True`` for
 the ``created`` variable if the object was soft-deleted and is now "revived".
 
-
+By default, the field that indicates a database entry is soft-deleted is ``deleted``, however, you can override the field name
+using the ``SAFE_DELETE_FIELD_NAME`` setting.
 
 Documentation
 -------------