#396 fix - Many issues fixed: Block/Unblock commands, Upload request data, ...

rsanchez

2014-12-02 1493d0f7be4ccf14631ba3e0b31cf63ca7fcf32c

 securis/src/main/webapp/js/licenses.js
..
..
@@ -148,6 +148,7 @@
148
148
 				REQUESTED: 'RE',
149
149
 				PREACTIVE: 'PA',
150
150
 				EXPIRED: 'EX',
151
+				BLOCKED: 'BL',
151
152
 				CANCELLED: 'CA'
152
153
 		}
153
154
 
..
..
@@ -157,6 +158,7 @@
157
158
 				'PA': $L.get('Pre-active'),
158
159
 				'RE': $L.get('Requested'),
159
160
 				'EX': $L.get('Expired'),
161
+				'BL': $L.get('Blocked'),
160
162
 				'CA': $L.get('Cancelled')
161
163
 		};
162
164
 
..
..
@@ -165,13 +167,14 @@
165
167
 		 * we copy them for simplicity, this info won't change easily
166
168
 		 */
167
169
 		var LIC_ACTIONS_BY_STATUS = {
170
+				add_request: [LIC_STATUS.CREATED],
168
171
 				activate: [LIC_STATUS.CREATED, LIC_STATUS.REQUESTED, LIC_STATUS.PREACTIVE],
169
172
 				send: [LIC_STATUS.ACTIVE, LIC_STATUS.PREACTIVE],
170
173
 				download: [LIC_STATUS.ACTIVE, LIC_STATUS.PREACTIVE],
171
174
 				block: [LIC_STATUS.CANCELLED],
172
-				unblock: [LIC_STATUS.CANCELLED],
175
+				unblock: [LIC_STATUS.BLOCKED],
173
176
 				cancel: [LIC_STATUS.REQUESTED, LIC_STATUS.EXPIRED, LIC_STATUS.PREACTIVE, LIC_STATUS.ACTIVE],
174
-				'delete': [LIC_STATUS.CREATED, LIC_STATUS.CANCELLED]
177
+				'delete': [LIC_STATUS.CREATED, LIC_STATUS.CANCELLED, LIC_STATUS.BLOCKED]
175
178
 		}
176
179
 
177
180
 		var licenseResource = $resource('license/:licenseId/:action', {
..
..
@@ -217,6 +220,7 @@
217
220
 					'AC': '#329e5a',
218
221
 					'RE': '#2981d4',
219
222
 					'EX': '#ea7824',
223
+					'BL': '#ff0000',
220
224
 					'CA': '#a21717'
221
225
 			};
222
226
 
..
..
@@ -236,9 +240,11 @@
236
240
 				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);
237
241
 				if (error.headers('X-SECURIS-ERROR-CODE') === '1301') {
238
242
 					Packs.nextliccode(license.pack_id, function(data) {
239
-						console.log('New code: ' + data);
240
-						license.code = data;
241
-						toaster.pop('info', 'Licenses', $L.get("New license code, {0}, has been generated, please try again", license.code), 5000);
243
+						if (license.code !== data) {
244
+							// Only if the new code is different we can think about an erro related with License CODE 
245
+							license.code = data;
246
+							toaster.pop('info', 'Licenses', $L.get("New license code, {0}, has been generated, please try again", license.code), 5000);
247
+						} 
242
248
 					});
243
249
 				}
244
250
 			}
..
..
@@ -348,7 +354,8 @@
348
354
 							scope.$apply();
349
355
 						}
350
356
 
351
-						reader.readAsText(fileList[0]);       
357
+						reader.readAsText(fileList[0]); 
358
+						element.val('');
352
359
 					} else {
353
360
 						setter(scope.$parent, '');
354
361
 						scope.$apply();
..
..
@@ -383,6 +390,9 @@
383
390
 	                                    		   return txt.substring(0, len) + '...';
384
391
 	                                    	   }
385
392
 	                                    	   $scope.currentPack = $store.get('currentPack');
393
+	                                    	   setTimeout(function() {
394
+	                                    		   $scope.$broadcast('pack_changed', $scope.currentPack);
395
+	                                    	   }, 0);
386
396
 
387
397
 	                                       }]);
388
398