#2140 fix - Many changes related with cahce and JPA cycling relationships

rsanchez

2014-12-12 4c13c7324a920f5cca9601154e5224e5d7484fa9

 securis/src/main/webapp/js/admin.js
..
..
@@ -69,10 +69,7 @@
69
69
 
70
70
 				$scope.selectCatalog = _changeCatalog;
71
71
 				
72
-				$scope.edit = function(data) {
73
-					$scope.showForm = true;
74
-					$scope.isNew = false;
75
-					// Next line is a workaround due to some issues with values with ID == 0
72
+				$scope._loadFormu = function(elementData) {
76
73
 					$('select').val(null);
77
74
 					$scope.formu = {}
78
75
 					var fields = Catalogs.getMetadata().fields;
..
..
@@ -83,13 +80,23 @@
83
80
 							// next lines are a workaround to avoid an issue where we try to show a form with "select" fields (if select field value doesn't change
84
81
 							$scope.formu[field.name] = null;
85
82
 							setTimeout(function() {
86
-								$scope.formu[field.name] = data[field.name];
83
+								$scope.formu[field.name] = elementData[field.name];
87
84
 								$scope.$apply();
88
85
 							}, 0);
89
86
 						} else {
90
-							if (!field.listingOnly) $scope.formu[field.name] = data[field.name] || null;
87
+							if (!field.listingOnly) $scope.formu[field.name] = elementData[field.name] || null;
91
88
 						}
92
89
 					})
90
+				}
91
+				
92
+				$scope.edit = function(data) {
93
+					$scope.showForm = true;
94
+					$scope.isNew = false;
95
+					$scope._loadFormu(data);
96
+					Catalogs.get(data[Catalogs.getPk()], function(eleData) {
97
+						$scope._loadFormu(eleData);
98
+					});
99
+					// Next line is a workaround due to some issues with values with ID == 0
93
100
 					setTimeout(function() {
94
101
 						$('#'+Catalogs.getFFF()).focus();
95
102
 					}, 0);