common/securis.git

..	..	@@ -427,6 +427,10 @@
427	427	var refFields = [{resource: 'organization', name: 'organization_id'},{resource: 'licensetype', name: 'license_type_id'}];
428	428	Catalogs.loadRefs(function(refs) {
429	429	$scope.refs = refs;
	430	+ angular.forEach($scope.packs, function(elem) {
	431	+ elem.organization_code = $scope.getOrganizationCode(elem.organization_id);
	432	+ elem.license_type_code = $scope.getLicenseTypeCode(elem.license_type_id);
	433	+ });
430	434	}, refFields);
431	435	});
432	436
..	..	@@ -440,7 +444,12 @@
440	444	// the new pack
441	445	$scope.pack = null;
442	446
443		- $scope.packs = Packs.getPacksList();
	447	+ $scope.packs = Packs.getPacksList(function(list) {
	448	+ angular.forEach(list, function(elem) {
	449	+ elem.organization_code = $scope.getOrganizationCode(elem.organization_id);
	450	+ elem.license_type_code = $scope.getLicenseTypeCode(elem.license_type_id);
	451	+ });
	452	+ });
444	453
445	454	$scope.save = function() {
446	455	Packs.savePackData($scope.pack, $scope.isNew, function() {
..	..	@@ -609,6 +618,28 @@
609	618	return label;
610	619	}
611	620
	621	+ $scope.getOrganizationCode = function(orgId) {
	622	+ return $scope._getCodeFromId('organization_id', orgId);
	623	+ }
	624	+
	625	+ $scope.getLicenseTypeCode = function(ltId) {
	626	+ return $scope._getCodeFromId('license_type_id', ltId);
	627	+ }
	628	+
	629	+ $scope._getCodeFromId = function(field, myid) {
	630	+ if (!myid) {
	631	+ return null;
	632	+ }
	633	+ var list = $scope.refs[field];
	634	+ for(var i = 0; list && i < list.length; i++) {
	635	+ var elem = list[i];
	636	+ if (elem.id === myid) {
	637	+ return elem.code;
	638	+ }
	639	+ }
	640	+ return null;
	641	+ }
	642	+
612	643	$scope.createMetadataRow = function() {
613	644	if (!$scope.formu.metadata) {
614	645	$scope.formu.metadata = [];