Use soft-delete for nodes

2016-05-02 17:06:59 +02:00
parent b9367f9944
commit 3e8494e3bf
10 changed files with 9 additions and 19 deletions
--- a/pillar/manage_extra/node_types/comment.py
+++ b/pillar/manage_extra/node_types/comment.py
@@ -11,7 +11,6 @@ node_type_comment = {
            'type': 'string',
            'allowed': [
                'published',
-                'deleted',
                'flagged',
                'edited'
            ],
--- a/pillar/manage_extra/node_types/group.py
+++ b/pillar/manage_extra/node_types/group.py
@@ -15,7 +15,6 @@ node_type_group = {
            'allowed': [
                'published',
                'pending',
-                'deleted'
            ],
        },
        'notes': {
--- a/pillar/manage_extra/node_types/group_texture.py
+++ b/pillar/manage_extra/node_types/group_texture.py
@@ -15,7 +15,6 @@ node_type_group_texture = {
            'allowed': [
                'published',
                'pending',
-                'deleted'
            ],
        }
    },
--- a/pillar/manage_extra/node_types/page.py
+++ b/pillar/manage_extra/node_types/page.py
@@ -15,7 +15,6 @@ node_type_page = {
            'type': 'string',
            'allowed': [
                'published',
-                'deleted',
                'pending'
            ],
            'default': 'pending'
--- a/pillar/manage_extra/node_types/post.py
+++ b/pillar/manage_extra/node_types/post.py
@@ -15,7 +15,6 @@ node_type_post = {
            'type': 'string',
            'allowed': [
                'published',
-                'deleted',
                'pending'
            ],
            'default': 'pending'
--- a/pillar/manage_extra/node_types/project.py
+++ b/pillar/manage_extra/node_types/project.py
@@ -58,7 +58,6 @@ node_type_project = {
            'allowed': [
                'published',
                'pending',
-                'deleted'
            ],
        },
        # Logo
--- a/pillar/manage_extra/node_types/texture.py
+++ b/pillar/manage_extra/node_types/texture.py
@@ -13,7 +13,6 @@ node_type_texture = {
                'published',
                'pending',
                'processing',
-                'deleted'
            ],
        },
        # Used for sorting within the context of a group
--- a/pillar/settings.py
+++ b/pillar/settings.py
@@ -579,7 +579,6 @@ projects_schema = {
        'allowed': [
            'published',
            'pending',
-            'deleted'
        ],
    },
    # Latest nodes being edited
@@ -701,6 +700,7 @@ nodes = {
    'schema': nodes_schema,
    'public_methods': ['GET'],
    'public_item_methods': ['GET'],
+    'soft_delete': True,
 }

 users = {