Skip to content

Commit

Permalink
removed softDeleteable
Browse files Browse the repository at this point in the history
  • Loading branch information
Guite committed Feb 19, 2017
1 parent 899abb7 commit 8bb2242
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 5 deletions.
Expand Up @@ -254,7 +254,6 @@ Includes basically all relationships in the data layer except inheritance.

* The edit type `ACTIVE_CHOOSE_PASSIVE_NONE` is only valid for many to many relationships.
* The edit type `ACTIVE_EDIT_PASSIVE_NONE` is only valid for many to many relationships.
* Entities with soft-deleteable need a remove cascade for any incoming one-to-one relationships. See [this issue](https://github.com/Atlantic18/DoctrineExtensions/issues/936) for more information.

#### Many to one relationship

Expand Down
Expand Up @@ -206,7 +206,6 @@ It has the following properties:
* **slugStyle** - Which [slug style](#entity-slug-style) is used. Default value is `LOWERCASE`.
* **slugUnique** - A boolean specifying if the slug is unique or not. Default value is `true`.
* **slugUpdatable** - A boolean specifying if the slug can be changed or not. Default value is `true`.
* **softDeleteable** - Whether deleted items should only be marked as deleted instead of deleting them. Defines also whether the entity workflow provides means for trashing and recovering items or for deleting them. See [SoftDeleteable extension](https://github.com/Atlantic18/DoctrineExtensions/blob/master/doc/softdeleteable.md) and [workflow types](#entity-workflow-type) for more information. The default value is `false`. Be careful with combining this with other behaviours, as it seems there are problems with for example using it together with loggable, timestampable and blameable. Thus this is **deprecated** and will be removed in a future version. Consider using loggable instead for which also undeletion functionality is generated (see above).
* **tree** - Whether and which tree strategy is applied. Default value is `NONE`. More information about what the generator creates for trees can be found in the the section about [tree types](#entity-tree-type).

![Tree functionality with context menu and drag n drop](images/generator_tree.png "Tree functionality with context menu and drag n drop")
Expand Down Expand Up @@ -785,8 +784,7 @@ In total there are nine different workflow states which are explained below. Not
5. **Approved** - content has been approved and is available online.
6. **Suspended** - content has been approved, but is temporarily offline. Only available if the entity has set the `hasTray` property to `true`.
7. **Archived** - content has reached the end and became archived. Only available if the entity has set the `hasArchive` property to `true`. Requires a [datetime](#datetime-field) or a [date](#date-field) field being designated as end date.
8. **Trashed** - content has been marked as deleted, but is still persisted in the database. Only available if the entity has set the `softDeleteable` property to `true`.
9. **Deleted** - pseudo-state for content which has been deleted from the database.
8. **Deleted** - pseudo-state for content which has been deleted from the database.

The following image shows an overview of all possible workflow states and actions.

Expand Down
2 changes: 1 addition & 1 deletion bundles/de.guite.modulestudio.help/doc/98-Changelog.md
Expand Up @@ -8,7 +8,7 @@

### DSL / Modelling language changes

* None yet.
* Removed the `softDeleteable` property which has been deprecated before (#970).

### Generator changes

Expand Down
Binary file modified bundles/de.guite.modulestudio.help/doc/images/workflows.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 8bb2242

Please sign in to comment.