#394 feature - Catalog module finished in beta - Security and Error managem...

Roberto Sánchez

2014-01-10 3d0c6e4865d4a0ddd764da533a327faf76e0cb32

 securis/src/main/resources/static/js/catalogs.json
..
..
@@ -7,6 +7,7 @@
7
7
 		"display" : "ID",
8
8
 		"type" : "number",
9
9
 		"pk" : true,
10
+		"autogenerate" : true,
10
11
 		"readOnly" : true
11
12
 	}, {
12
13
 		"name" : "name",
..
..
@@ -23,6 +24,7 @@
23
24
 	}, {
24
25
 		"name" : "creationTimestamp",
25
26
 		"display" : "Creation date",
27
+		"autogenerate" : true,
26
28
 		"type" : "date",
27
29
 		"readOnly" : true
28
30
 	} ]
..
..
@@ -35,6 +37,7 @@
35
37
 		"display" : "ID",
36
38
 		"type" : "number",
37
39
 		"pk" : true,
40
+		"autogenerate" : true,
38
41
 		"readOnly" : true
39
42
 	}, {
40
43
 		"name" : "code",
..
..
@@ -62,6 +65,7 @@
62
65
 	}, {
63
66
 		"name" : "creationTimestamp",
64
67
 		"display" : "Creation date",
68
+		"autogenerate" : true,
65
69
 		"type" : "date",
66
70
 		"readOnly" : true
67
71
 	}, {
..
..
@@ -71,13 +75,14 @@
71
75
 	} ]
72
76
 }, {
73
77
 	"name" : "Organizations",
74
-	"list_fields" : [ "code", "name", "application_name", "creationTimestamp" ],
78
+	"list_fields" : [ "code", "name", "org_parent_name", "creationTimestamp" ],
75
79
 	"resource" : "organization",
76
80
 	"fields" : [ {
77
81
 		"name" : "id",
78
82
 		"display" : "ID",
79
83
 		"type" : "number",
80
84
 		"pk" : true,
85
+		"autogenerate" : true,
81
86
 		"readOnly" : true
82
87
 	}, {
83
88
 		"name" : "code",
..
..
@@ -98,24 +103,67 @@
98
103
 		"maxlength" : 500,
99
104
 		"multiline" : 2
100
105
 	}, {
101
-		"name" : "application_id",
102
-		"display" : "Application",
103
-		"resource" : "application",
106
+		"name" : "org_parent_id",
107
+		"display" : "Parent organization",
108
+		"resource" : "organization",
104
109
 		"type" : "select"
110
+	}, {
111
+		"name" : "users_ids",
112
+		"display" : "Users",
113
+		"resource" : "user",
114
+		"type" : "multiselect"
105
115
 	}, {
106
116
 		"name" : "creationTimestamp",
107
117
 		"display" : "Creation date",
118
+		"autogenerate" : true,
108
119
 		"type" : "date",
109
120
 		"readOnly" : true
110
121
 	}, {
111
-		"name" : "application_name",
112
-		"display" : "Application",
122
+		"name" : "org_parent_name",
123
+		"display" : "Parent org",
113
124
 		"listingOnly" : true
114
125
 	} ]
115
126
 }, {
116
127
 	"name" : "Users",
128
+	"list_fields" : [ "username", "first_name", "last_name", "lastLogin" ],
117
129
 	"resource" : "user",
118
-	"fields" : []
130
+	"fields" : [ {
131
+		"name" : "username",
132
+		"display" : "Username",
133
+		"type" : "string",
134
+		"maxlength" : 45,
135
+		"pk" : true,
136
+		"readOnly" : true,
137
+		"mandatory" : true
138
+	}, {
139
+		"name" : "first_name",
140
+		"display" : "First name",
141
+		"type" : "string",
142
+		"maxlength" : 100,
143
+		"mandatory" : true
144
+	}, {
145
+		"name" : "last_name",
146
+		"display" : "Last name",
147
+		"type" : "string",
148
+		"maxlength" : 100
149
+	}, {
150
+		"name" : "organizations_ids",
151
+		"display" : "Organizations",
152
+		"resource" : "organization",
153
+		"type" : "multiselect"
154
+	}, {
155
+		"name" : "lastLogin",
156
+		"display" : "Last login",
157
+		"autogenerate" : true,
158
+		"type" : "date",
159
+		"readOnly" : true
160
+	}, {
161
+		"name" : "creationTimestamp",
162
+		"display" : "Creation date",
163
+		"autogenerate" : true,
164
+		"type" : "date",
165
+		"readOnly" : true
166
+	}]
119
167
 }, {
120
168
 	"name" : "System params",
121
169
 	"resource" : "systemparams",