Changeset 4104 for cats

Timestamp:

11/28/13 09:34:58 (11 years ago)

Author:

andmor

Message:

Improved UI error handeling and AngularJS 1.2.2 compatibility

Location:

cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.site/site

Files:

• partials/accountDetails.html (modified) (1 diff)
• scripts/controllers.js (modified) (17 diffs)

cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.site/site/partials/accountDetails.html

@@ -47 +47 @@
                                 </span>
                             </p>
+                            <span class="control-group error" data-ng-show="removeEmailAjaxError">
+                                <small class="help-block">
+                                    <div>The server responded with an error. Please try again!</div>
+                                    <div>If the problem persists contact us at:</div>
+                                    <div><a href="mailto:tla@mpi.nl">isocat@mpi.nl</a></div>
+                                </small>
+                            </span>
                             <form data-ng-show="edditingEmail" name="editEmailForm" class="form-inline" novalidate="novalidate">
                                 <input name="editEmailInput" type="email" required="required" data-ng-model="editEmailText"/>

cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.site/site/scripts/controllers.js

@@ -147 +147 @@
                 //controller (next page), thus we have to keep the server data across controller 
                 //reloads by saving it in the parent scope.
-                parentScope.schemasResult = SchemasList.get({userID:UserService.id, 
+                SchemasList.get({userID:UserService.id, 
                     startPage:page, pageSize:$scope.pageSize}, 
                         function(result){
@@ -167 +167 @@
                             loadSchemaMetadata($location.search().schemaIndex);
                             
-                            return result;
+                            parentScope.schemasResult = result;
                         });            
             }
@@ -189 +189 @@
                 //make AJAX call to get the schema metadata for the selected row
                 var selectedSchemaRow = parentScope.schemasList[Number(index)];
-                parentScope.selectedSchema = Schema.get({schemaID:selectedSchemaRow['xml:id']}, 
+                Schema.get({schemaID:selectedSchemaRow['xml:id']}, 
                     function(result){
                         //when there is just one element we create an array with it, so ng-repeat repeats just once
@@ -210 +210 @@
                             $scope.animateSchemaChange='';
                         
+                        parentScope.selectedSchema = result;
                         parentScope.resultHasArrived = true;
                     });
@@ -532 +533 @@
         function updateAddingEmail(){
             $scope.waitingForServer = false;
-            $scope.ajaxError = false;
+            
             if($location.search().addingEmail)
                 $scope.addingEmail = true;
@@ -551 +552 @@
         
         $scope.terminateAddEmail = function (){
+            $scope.ajaxError = false;
             $scope.newEmailInputText = '';
             $scope.newEmailForm.$setPristine();
@@ -565 +567 @@
             user.$save({userID:UserService.id},
                 function(result) {
-                    if(result['sc:response'].success){
+                    if(result['sc:response'] !== undefined && result['sc:response'].success){
                         UserService.email.push(email);
                         $scope.newEmailForm.$setPristine();
@@ -601 +603 @@
             user.$save({userID:UserService.id},
                 function(result) {
-                    if(result['sc:response'].success){
+                    if(result['sc:response'] !== undefined && result['sc:response'].success){
                         $scope.displayName = UserService.displayName = $scope.editDisplayNameText;
                         $scope.terminateEditDisplayName();
@@ -608 +610 @@
                         //server reports an handeled error
                         $scope.waitingForServerEditDisplayName = false;
-                        $scope.ajaxError = true;
+                        $scope.editDisplayNameAjaxError = true;
                     }
                 },
@@ -650 +652 @@
             function updateEdditingEmail(){
                 $scope.waitingForServerEditEmail = false;
-                $scope.editEmailAjaxError = false;
                 if($location.search().edditingEmail !== undefined && $location.search().edditingEmail.indexOf($scope.emailInstance) !== -1){
                     if($scope.editEmailText === undefined)
@@ -662 +663 @@
             updateEdditingEmail();
                 
-            $scope.editEmail = function (emailInstance){         
+            $scope.editEmail = function (emailInstance){      
                 var locationSearch = $location.search();
+                $scope.removeEmailAjaxError = false;
                 if(locationSearch.edditingEmail === undefined)
                     locationSearch.edditingEmail = emailInstance;
@@ -681 +683 @@
                 user.$save({userID:UserService.id},
                     function(result) {
-                        if(result['sc:response'].success){
+                        if(result['sc:response'] !== undefined && result['sc:response'].success){
                             UserService.email.splice(index, 1);
                         }
@@ -687 +689 @@
                             //server reports an handeled error
                             $scope.waitingForServerEditEmail = false;
-                            $scope.editEmailAjaxError = true;
+                            $scope.removeEmailAjaxError = true;
                         }
                     },
@@ -693 +695 @@
                     function(){
                         $scope.waitingForServerEditEmail = false;
-                        $scope.editEmailAjaxError = true;
+                        $scope.removeEmailAjaxError = true;
                     });
             };
@@ -706 +708 @@
                 user.$save({userID:UserService.id},
                     function(result) {
-                        if(result['sc:response'].success){
+                        if(result['sc:response'] !== undefined && result['sc:response'].success){
                             $scope.cancelEditEmail(UserService.email[index]);
                             UserService.email[index] = $scope.editEmailText;
@@ -726 +728 @@
             $scope.cancelEditEmail = function (emailInstance){
                 var locationSearch = $location.search();
-                
+                $scope.editEmailAjaxError = false;
                 $scope.editEmailText = undefined;
                 
@@ -788 +790 @@
                 user.$save({userID:UserService.id},
                     function(result) {
-                        if(result['sc:response'].success)
+                        if(result['sc:response'] !== undefined && result['sc:response'].success)
                             document.location.pathname = "schemacat/site/index.html";
                         else {