From 36edce38f6b17f73322fa38404d6e01818a44fd2 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Thu, 11 Dec 2014 19:08:16 +0000
Subject: [PATCH] #2140 fix - Added renew period to pack, change on DB schema, fixed pack selection in listing, upgrade angular to 1.3.6 and other minor issues
---
securis/src/main/java/net/curisit/securis/db/Pack.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 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 5e44cac..2cb6da8 100644
--- a/securis/src/main/java/net/curisit/securis/db/Pack.java
+++ b/securis/src/main/java/net/curisit/securis/db/Pack.java
@@ -99,9 +99,13 @@
@JsonProperty("license_preactivation")
private boolean licensePreactivation;
- @Column(name = "default_valid_period")
- @JsonProperty("default_valid_period")
- private Integer defaultValidPeriod;
+ @Column(name = "preactivation_valid_period")
+ @JsonProperty("preactivation_valid_period")
+ private Integer preactivationValidPeriod;
+
+ @Column(name = "renew_valid_period")
+ @JsonProperty("renew_valid_period")
+ private Integer renewValidPeriod;
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "pack")
private Set<PackMetadata> metadata;
@@ -343,12 +347,20 @@
return (id == null ? 0 : id.hashCode());
}
- public Integer getDefaultValidPeriod() {
- return defaultValidPeriod;
+ public Integer getPreactivationValidPeriod() {
+ return preactivationValidPeriod;
}
- public void setDefaultValidPeriod(Integer defaultValidPeriod) {
- this.defaultValidPeriod = defaultValidPeriod;
+ public void setPreactivationValidPeriod(Integer preactivationValidPeriod) {
+ this.preactivationValidPeriod = preactivationValidPeriod;
+ }
+
+ public Integer getRenewValidPeriod() {
+ return renewValidPeriod;
+ }
+
+ public void setRenewValidPeriod(Integer renewValidPeriod) {
+ this.renewValidPeriod = renewValidPeriod;
}
public static class Action {
--
Gitblit v1.3.2