From cb87bea47fbc0449db07fbba657926bd5fa137c8 Mon Sep 17 00:00:00 2001 From: Francesco Siddi Date: Wed, 18 May 2016 17:40:27 +0200 Subject: [PATCH] Update node_type texture and group_texture --- pillar/manage_extra/node_types/group_texture.py | 2 -- pillar/manage_extra/node_types/texture.py | 15 ++++++--------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/pillar/manage_extra/node_types/group_texture.py b/pillar/manage_extra/node_types/group_texture.py index 2ac4ea55..4cba0bb4 100644 --- a/pillar/manage_extra/node_types/group_texture.py +++ b/pillar/manage_extra/node_types/group_texture.py @@ -18,7 +18,5 @@ node_type_group_texture = { 'form_schema': { 'status': {}, 'order': {} - }, - 'permissions': { } } diff --git a/pillar/manage_extra/node_types/texture.py b/pillar/manage_extra/node_types/texture.py index 0cc39d97..09b125ea 100644 --- a/pillar/manage_extra/node_types/texture.py +++ b/pillar/manage_extra/node_types/texture.py @@ -5,14 +5,13 @@ node_type_texture = { 'description': 'Image Texture', # This data type does not have parent limitations (can be child # of any node). An empty parent declaration is required. - 'parent': ['group',], + 'parent': ['group', ], 'dyn_schema': { 'status': { 'type': 'string', 'allowed': [ 'published', 'pending', - 'processing', ], }, # Used for sorting within the context of a group @@ -29,10 +28,10 @@ node_type_texture = { 'map_type': { 'type': 'string', 'allowed': [ - 'col', - 'spec', + 'color', + 'specular', 'bump', - 'nor', + 'normal', 'translucency', 'emission', 'alpha' @@ -68,9 +67,7 @@ node_type_texture = { 'resolution': {}, 'aspect_ratio': {}, 'order': {}, - 'tags' : {}, - 'categories': {} - }, - 'permissions': { + 'tags': {'visible': False}, + 'categories': {'visible': False}, } }