#0 fix - Set activation_code on Lic modification if it's null and show Edit...

rsanchez

2015-10-22 e2c2a47ec8802c006e6932cfe8229ef5caff9d0a

#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
..
..
@@ -3,7 +3,7 @@
3
3
 	<modelVersion>4.0.0</modelVersion>
4
4
 	<groupId>net.curisit</groupId>
5
5
 	<artifactId>securis-server</artifactId>
6
-	<version>1.1.2</version>
6
+	<version>1.1.3</version>
7
7
 	<name>SeCuris</name>
8
8
 	<description>CurisTEC Server Licenses</description>
9
9
 	<dependencies>
 securis/src/main/java/net/curisit/securis/services/LicenseResource.java
..
..
@@ -486,6 +486,9 @@
486
486
         currentLicense.setComments(lic.getComments());
487
487
         currentLicense.setFullName(lic.getFullName());
488
488
         currentLicense.setEmail(lic.getEmail());
489
+        if (currentLicense.getActivationCode() == null) {
490
+            currentLicense.setActivationCode(lic.getActivationCode());
491
+        }
489
492
 
490
493
         if (currentLicense.getStatus() == LicenseStatus.CREATED && !ObjectUtils.equals(currentLicense.getReqDataHash(), lic.getReqDataHash())) {
491
494
             if (lic.getRequestData() != null) {
 securis/src/main/webapp/js/licenses.js
..
..
@@ -170,7 +170,7 @@
170
170
 		 * we copy them for simplicity, this info won't change easily
171
171
 		 */
172
172
 		var LIC_ACTIONS_BY_STATUS = {
173
-				edit: [LIC_STATUS.REQUESTED, LIC_STATUS.EXPIRED, LIC_STATUS.PREACTIVE, LIC_STATUS.ACTIVE, LIC_STATUS.CANCELLED, LIC_STATUS.BLOCKED],
173
+				edit: [LIC_STATUS.REQUESTED, LIC_STATUS.CREATED, LIC_STATUS.EXPIRED, LIC_STATUS.PREACTIVE, LIC_STATUS.ACTIVE, LIC_STATUS.CANCELLED, LIC_STATUS.BLOCKED],
174
174
 				add_request: [LIC_STATUS.CREATED],
175
175
 				activate: [LIC_STATUS.CREATED, LIC_STATUS.REQUESTED, LIC_STATUS.PREACTIVE],
176
176
 				send: [LIC_STATUS.ACTIVE, LIC_STATUS.PREACTIVE],