#396 feature - Added session timeout and responsive layour untill 1600px

Roberto Sánchez

2014-01-22 1a0d1f15efa2b4cbdc6dd30b5a85b111d0599b63

 securis/src/main/java/net/curisit/securis/db/Pack.java
..
..
@@ -19,6 +19,7 @@
19
19
 
20
20
 import org.codehaus.jackson.annotate.JsonAutoDetect;
21
21
 import org.codehaus.jackson.annotate.JsonIgnore;
22
+import org.codehaus.jackson.annotate.JsonIgnoreProperties;
22
23
 import org.codehaus.jackson.annotate.JsonProperty;
23
24
 import org.codehaus.jackson.map.annotate.JsonSerialize;
24
25
 
..
..
@@ -30,6 +31,7 @@
30
31
 @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
31
32
 @Entity
32
33
 @Table(name = "pack")
34
+@JsonIgnoreProperties(ignoreUnknown = true)
33
35
 @NamedQueries(
34
36
 	{ @NamedQuery(name = "list-packs", query = "SELECT pa FROM Pack pa"),//
35
37
 			@NamedQuery(name = "list-packs-by-orgs", query = "SELECT pa FROM Pack pa where pa.organization.id in :list_ids") })
..
..
@@ -222,7 +224,7 @@
222
224
 
223
225
 	@JsonProperty("created_by_name")
224
226
 	public String getCreatedByname() {
225
-		return createdBy == null ? null : String.format("%s %s", createdBy.getFirstName(), createdBy.getFirstName());
227
+		return createdBy == null ? null : String.format("%s %s (%s)", createdBy.getFirstName(), createdBy.getLastName(), createdBy.getUsername());
226
228
 	}
227
229
 
228
230
 	@JsonProperty("licensetype_code")