From 1a0d1f15efa2b4cbdc6dd30b5a85b111d0599b63 Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Wed, 22 Jan 2014 20:59:13 +0000
Subject: [PATCH] #396 feature - Added session timeout and responsive layour untill 1600px
---
securis/src/main/java/net/curisit/securis/db/Pack.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/db/Pack.java b/securis/src/main/java/net/curisit/securis/db/Pack.java
index 254d6b0..608b7ed 100644
--- a/securis/src/main/java/net/curisit/securis/db/Pack.java
+++ b/securis/src/main/java/net/curisit/securis/db/Pack.java
@@ -19,6 +19,7 @@
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonIgnore;
+import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonSerialize;
@@ -30,6 +31,7 @@
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
@Entity
@Table(name = "pack")
+@JsonIgnoreProperties(ignoreUnknown = true)
@NamedQueries(
{ @NamedQuery(name = "list-packs", query = "SELECT pa FROM Pack pa"),//
@NamedQuery(name = "list-packs-by-orgs", query = "SELECT pa FROM Pack pa where pa.organization.id in :list_ids") })
@@ -222,7 +224,7 @@
@JsonProperty("created_by_name")
public String getCreatedByname() {
- return createdBy == null ? null : String.format("%s %s", createdBy.getFirstName(), createdBy.getFirstName());
+ return createdBy == null ? null : String.format("%s %s (%s)", createdBy.getFirstName(), createdBy.getLastName(), createdBy.getUsername());
}
@JsonProperty("licensetype_code")
--
Gitblit v1.3.2