From b33557d3faf3e45eff3d3e19f4a1549ffe907b4c Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Tue, 18 Nov 2014 10:52:52 +0000
Subject: [PATCH] #396 fix - Corrected actions: "Download" and "Send email"
---
securis/src/main/java/net/curisit/securis/db/Pack.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 b44548c..8406bff 100644
--- a/securis/src/main/java/net/curisit/securis/db/Pack.java
+++ b/securis/src/main/java/net/curisit/securis/db/Pack.java
@@ -22,6 +22,8 @@
import net.curisit.integrity.commons.Utils;
+import org.hibernate.annotations.Type;
+
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -89,6 +91,7 @@
@JsonProperty("end_valid_date")
private Date endValidDate;
+ @Type(type = "net.curisit.securis.db.common.PackStatusType")
private PackStatus status;
@Column(name = "license_preactivation")
@@ -357,7 +360,7 @@
public static class Status {
- private static final Map<Integer, List<Integer>> transitions = Utils.createMap( //
+ private static final Map<Integer, List<PackStatus>> transitions = Utils.createMap( //
Action.ACTIVATION, Arrays.asList(PackStatus.CREATED, PackStatus.ON_HOLD, PackStatus.EXPIRED), //
Action.PUT_ONHOLD, Arrays.asList(PackStatus.ACTIVE), //
Action.CANCEL, Arrays.asList(PackStatus.ACTIVE, PackStatus.ON_HOLD, PackStatus.EXPIRED), //
@@ -373,7 +376,7 @@
* @return
*/
public static boolean isActionValid(Integer action, PackStatus currentStatus) {
- List<Integer> validStatuses = transitions.get(action);
+ List<PackStatus> validStatuses = transitions.get(action);
return validStatuses != null && validStatuses.contains(currentStatus);
}
--
Gitblit v1.3.2