From 1493d0f7be4ccf14631ba3e0b31cf63ca7fcf32c Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Tue, 02 Dec 2014 17:57:50 +0000
Subject: [PATCH] #396 fix - Many issues fixed: Block/Unblock commands, Upload request data, Send second email, ...
---
securis/src/main/java/net/curisit/securis/db/License.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/db/License.java b/securis/src/main/java/net/curisit/securis/db/License.java
index b8ce30f..ab7064c 100644
--- a/securis/src/main/java/net/curisit/securis/db/License.java
+++ b/securis/src/main/java/net/curisit/securis/db/License.java
@@ -115,6 +115,9 @@
@Column(name = "license_data")
@JsonProperty("license_data")
+ @JsonIgnore
+ // The license data is sent to user as a separate file, It doesn't need to
+ // be included as License attribute on browser
private String licenseData;
@Column(name = "creation_timestamp")
@@ -136,6 +139,7 @@
private String comments;
@OneToMany(fetch = FetchType.LAZY, mappedBy = "license")
+ @JsonIgnore
private List<LicenseHistory> history;
public int getId() {
@@ -334,17 +338,19 @@
public static final int CANCEL = 6;
public static final int DELETE = 7;
public static final int BLOCK = 8;
+ public static final int UNBLOCK = 9;
}
public static class Status {
private static final Map<Integer, List<LicenseStatus>> transitions = Utils.createMap( //
Action.REQUEST, Arrays.asList(LicenseStatus.CREATED, LicenseStatus.REQUESTED), //
- Action.ACTIVATION, Arrays.asList(LicenseStatus.REQUESTED, LicenseStatus.PRE_ACTIVE, LicenseStatus.EXPIRED), //
+ Action.ACTIVATION, Arrays.asList(LicenseStatus.CREATED, LicenseStatus.REQUESTED, LicenseStatus.PRE_ACTIVE, LicenseStatus.EXPIRED), //
Action.SEND, Arrays.asList(LicenseStatus.ACTIVE, LicenseStatus.PRE_ACTIVE), //
Action.DOWNLOAD, Arrays.asList(LicenseStatus.ACTIVE, LicenseStatus.PRE_ACTIVE), //
Action.CANCEL, Arrays.asList(LicenseStatus.ACTIVE, LicenseStatus.PRE_ACTIVE, LicenseStatus.REQUESTED, LicenseStatus.EXPIRED), //
- Action.DELETE, Arrays.asList(LicenseStatus.CANCELLED, LicenseStatus.CREATED), //
+ Action.DELETE, Arrays.asList(LicenseStatus.CANCELLED, LicenseStatus.CREATED, LicenseStatus.BLOCKED), //
+ Action.UNBLOCK, Arrays.asList(LicenseStatus.BLOCKED), //
Action.BLOCK, Arrays.asList(LicenseStatus.CANCELLED) //
);
--
Gitblit v1.3.2