From 3d0c6e4865d4a0ddd764da533a327faf76e0cb32 Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Fri, 10 Jan 2014 18:50:52 +0000
Subject: [PATCH] #394 feature - Catalog module finished in beta - Security and Error management are not completed

---
 securis/src/main/resources/static/js/catalogs.json |   62 +++++++++++++++++++++++++++---
 1 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/securis/src/main/resources/static/js/catalogs.json b/securis/src/main/resources/static/js/catalogs.json
index a7facac..a371fde 100644
--- a/securis/src/main/resources/static/js/catalogs.json
+++ b/securis/src/main/resources/static/js/catalogs.json
@@ -7,6 +7,7 @@
 		"display" : "ID",
 		"type" : "number",
 		"pk" : true,
+		"autogenerate" : true,
 		"readOnly" : true
 	}, {
 		"name" : "name",
@@ -23,6 +24,7 @@
 	}, {
 		"name" : "creationTimestamp",
 		"display" : "Creation date",
+		"autogenerate" : true,
 		"type" : "date",
 		"readOnly" : true
 	} ]
@@ -35,6 +37,7 @@
 		"display" : "ID",
 		"type" : "number",
 		"pk" : true,
+		"autogenerate" : true,
 		"readOnly" : true
 	}, {
 		"name" : "code",
@@ -62,6 +65,7 @@
 	}, {
 		"name" : "creationTimestamp",
 		"display" : "Creation date",
+		"autogenerate" : true,
 		"type" : "date",
 		"readOnly" : true
 	}, {
@@ -71,13 +75,14 @@
 	} ]
 }, {
 	"name" : "Organizations",
-	"list_fields" : [ "code", "name", "application_name", "creationTimestamp" ],
+	"list_fields" : [ "code", "name", "org_parent_name", "creationTimestamp" ],
 	"resource" : "organization",
 	"fields" : [ {
 		"name" : "id",
 		"display" : "ID",
 		"type" : "number",
 		"pk" : true,
+		"autogenerate" : true,
 		"readOnly" : true
 	}, {
 		"name" : "code",
@@ -98,24 +103,67 @@
 		"maxlength" : 500,
 		"multiline" : 2
 	}, {
-		"name" : "application_id",
-		"display" : "Application",
-		"resource" : "application",
+		"name" : "org_parent_id",
+		"display" : "Parent organization",
+		"resource" : "organization",
 		"type" : "select"
+	}, {
+		"name" : "users_ids",
+		"display" : "Users",
+		"resource" : "user",
+		"type" : "multiselect"
 	}, {
 		"name" : "creationTimestamp",
 		"display" : "Creation date",
+		"autogenerate" : true,
 		"type" : "date",
 		"readOnly" : true
 	}, {
-		"name" : "application_name",
-		"display" : "Application",
+		"name" : "org_parent_name",
+		"display" : "Parent org",
 		"listingOnly" : true
 	} ]
 }, {
 	"name" : "Users",
+	"list_fields" : [ "username", "first_name", "last_name", "lastLogin" ],
 	"resource" : "user",
-	"fields" : []
+	"fields" : [ {
+		"name" : "username",
+		"display" : "Username",
+		"type" : "string",
+		"maxlength" : 45,
+		"pk" : true,
+		"readOnly" : true,
+		"mandatory" : true
+	}, {
+		"name" : "first_name",
+		"display" : "First name",
+		"type" : "string",
+		"maxlength" : 100,
+		"mandatory" : true
+	}, {
+		"name" : "last_name",
+		"display" : "Last name",
+		"type" : "string",
+		"maxlength" : 100
+	}, {
+		"name" : "organizations_ids",
+		"display" : "Organizations",
+		"resource" : "organization",
+		"type" : "multiselect"
+	}, {
+		"name" : "lastLogin",
+		"display" : "Last login",
+		"autogenerate" : true,
+		"type" : "date",
+		"readOnly" : true
+	}, {
+		"name" : "creationTimestamp",
+		"display" : "Creation date",
+		"autogenerate" : true,
+		"type" : "date",
+		"readOnly" : true
+	}]
 }, {
 	"name" : "System params",
 	"resource" : "systemparams",

--
Gitblit v1.3.2