From e2c2a47ec8802c006e6932cfe8229ef5caff9d0a Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Thu, 22 Oct 2015 15:24:35 +0000
Subject: [PATCH] #0 fix - Set activation_code on Lic modification if it's null and show Edit option on license menu on table list
---
securis/pom.xml | 2 +-
securis/src/main/java/net/curisit/securis/services/LicenseResource.java | 3 +++
securis/src/main/webapp/js/licenses.js | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/securis/pom.xml b/securis/pom.xml
index 59ac6d3..789a5cb 100644
--- a/securis/pom.xml
+++ b/securis/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.curisit</groupId>
<artifactId>securis-server</artifactId>
- <version>1.1.2</version>
+ <version>1.1.3</version>
<name>SeCuris</name>
<description>CurisTEC Server Licenses</description>
<dependencies>
diff --git a/securis/src/main/java/net/curisit/securis/services/LicenseResource.java b/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
index fc57a2f..0c5e258 100644
--- a/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
@@ -486,6 +486,9 @@
currentLicense.setComments(lic.getComments());
currentLicense.setFullName(lic.getFullName());
currentLicense.setEmail(lic.getEmail());
+ if (currentLicense.getActivationCode() == null) {
+ currentLicense.setActivationCode(lic.getActivationCode());
+ }
if (currentLicense.getStatus() == LicenseStatus.CREATED && !ObjectUtils.equals(currentLicense.getReqDataHash(), lic.getReqDataHash())) {
if (lic.getRequestData() != null) {
diff --git a/securis/src/main/webapp/js/licenses.js b/securis/src/main/webapp/js/licenses.js
index fc4faed..5539b44 100644
--- a/securis/src/main/webapp/js/licenses.js
+++ b/securis/src/main/webapp/js/licenses.js
@@ -170,7 +170,7 @@
* we copy them for simplicity, this info won't change easily
*/
var LIC_ACTIONS_BY_STATUS = {
- edit: [LIC_STATUS.REQUESTED, LIC_STATUS.EXPIRED, LIC_STATUS.PREACTIVE, LIC_STATUS.ACTIVE, LIC_STATUS.CANCELLED, LIC_STATUS.BLOCKED],
+ edit: [LIC_STATUS.REQUESTED, LIC_STATUS.CREATED, LIC_STATUS.EXPIRED, LIC_STATUS.PREACTIVE, LIC_STATUS.ACTIVE, LIC_STATUS.CANCELLED, LIC_STATUS.BLOCKED],
add_request: [LIC_STATUS.CREATED],
activate: [LIC_STATUS.CREATED, LIC_STATUS.REQUESTED, LIC_STATUS.PREACTIVE],
send: [LIC_STATUS.ACTIVE, LIC_STATUS.PREACTIVE],
--
Gitblit v1.3.2