#394 feature - Several fixes related with form management

Roberto Sánchez

2014-01-13 edd47c68c6a08bd756d96213c38e896a0a257bd1

 securis/src/main/resources/static/js/admin.js
..
..
@@ -62,10 +62,15 @@
62
62
 				$scope.edit = function(data) {
63
63
 					$scope.showForm = true;
64
64
 					$scope.isNew = false;
65
+					// Next line is a wirkaround due to some issues with values with ID == 0
66
+					$('select').val(null);
65
67
 					$scope.formu = {}
66
-					for (var k in data) {
67
-						if (k.indexOf('$') !== 0 && k.indexOf('_') !== 0 && !Catalogs.getField(k).listingOnly) $scope.formu[k] = data[k]
68
-					}
68
+					var fields = Catalogs.getMetadata().fields;
69
+					console.log($scope);
70
+					
71
+					fields.forEach(function(field) {
72
+						if (!field.listingOnly) $scope.formu[field.name] = data[field.name] || null;
73
+					})
69
74
 
70
75
 					setTimeout(function() {
71
76
 						$('#'+Catalogs.getFFF()).focus();
..
..
@@ -117,6 +122,7 @@
117
122
 				$scope.editNew = function() {
118
123
 					$scope.$parent.isNew = true;
119
124
 					$scope.$parent.showForm = true;
125
+					$('select').val(null);
120
126
 					$scope.$parent.formu = {};
121
127
 					setTimeout(function() {
122
128
 						$('#'+Catalogs.getFFF()).focus();
..
..
@@ -125,6 +131,7 @@
125
131
 				}
126
132
 				$scope.cancel = function() {
127
133
 					$scope.$parent.showForm = false;
134
+					$scope.catalogForm.$setPristine();
128
135
 				}
129
136
 
130
137
 				$scope.saveCatalog = function() {
..
..
@@ -134,6 +141,7 @@
134
141
 						var promise = Catalogs.save($scope.formu).$promise;
135
142
 						promise.then(function(data, otro) {
136
143
 							if ($scope.isNew) {
144
+								$scope.catalogForm.$setPristine();
137
145
 								$scope.$parent.formu = {}
138
146
 								$('#'+ Catalogs.getFFF()).focus();
139
147
 							} else {