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/webapp/js/licenses.js | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/securis/src/main/webapp/js/licenses.js b/securis/src/main/webapp/js/licenses.js
index 5e24c67..4d52d25 100644
--- a/securis/src/main/webapp/js/licenses.js
+++ b/securis/src/main/webapp/js/licenses.js
@@ -148,6 +148,7 @@
REQUESTED: 'RE',
PREACTIVE: 'PA',
EXPIRED: 'EX',
+ BLOCKED: 'BL',
CANCELLED: 'CA'
}
@@ -157,6 +158,7 @@
'PA': $L.get('Pre-active'),
'RE': $L.get('Requested'),
'EX': $L.get('Expired'),
+ 'BL': $L.get('Blocked'),
'CA': $L.get('Cancelled')
};
@@ -165,13 +167,14 @@
* we copy them for simplicity, this info won't change easily
*/
var LIC_ACTIONS_BY_STATUS = {
+ add_request: [LIC_STATUS.CREATED],
activate: [LIC_STATUS.CREATED, LIC_STATUS.REQUESTED, LIC_STATUS.PREACTIVE],
send: [LIC_STATUS.ACTIVE, LIC_STATUS.PREACTIVE],
download: [LIC_STATUS.ACTIVE, LIC_STATUS.PREACTIVE],
block: [LIC_STATUS.CANCELLED],
- unblock: [LIC_STATUS.CANCELLED],
+ unblock: [LIC_STATUS.BLOCKED],
cancel: [LIC_STATUS.REQUESTED, LIC_STATUS.EXPIRED, LIC_STATUS.PREACTIVE, LIC_STATUS.ACTIVE],
- 'delete': [LIC_STATUS.CREATED, LIC_STATUS.CANCELLED]
+ 'delete': [LIC_STATUS.CREATED, LIC_STATUS.CANCELLED, LIC_STATUS.BLOCKED]
}
var licenseResource = $resource('license/:licenseId/:action', {
@@ -217,6 +220,7 @@
'AC': '#329e5a',
'RE': '#2981d4',
'EX': '#ea7824',
+ 'BL': '#ff0000',
'CA': '#a21717'
};
@@ -236,9 +240,11 @@
toaster.pop('error', 'Licenses', $L.get("Error {0} license '{1}'. Reason: {2}", isNew ? $L.get("creating") : $L.get("updating"), license.code, $L.get(error.headers('X-SECURIS-ERROR-MSG'))), 5000);
if (error.headers('X-SECURIS-ERROR-CODE') === '1301') {
Packs.nextliccode(license.pack_id, function(data) {
- console.log('New code: ' + data);
- license.code = data;
- toaster.pop('info', 'Licenses', $L.get("New license code, {0}, has been generated, please try again", license.code), 5000);
+ if (license.code !== data) {
+ // Only if the new code is different we can think about an erro related with License CODE
+ license.code = data;
+ toaster.pop('info', 'Licenses', $L.get("New license code, {0}, has been generated, please try again", license.code), 5000);
+ }
});
}
}
@@ -348,7 +354,8 @@
scope.$apply();
}
- reader.readAsText(fileList[0]);
+ reader.readAsText(fileList[0]);
+ element.val('');
} else {
setter(scope.$parent, '');
scope.$apply();
@@ -383,6 +390,9 @@
return txt.substring(0, len) + '...';
}
$scope.currentPack = $store.get('currentPack');
+ setTimeout(function() {
+ $scope.$broadcast('pack_changed', $scope.currentPack);
+ }, 0);
}]);
--
Gitblit v1.3.2