From bbb9f31c292c5c79c7d40cdf6c6118cc83eb76be Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon, 14 Dec 2015 12:16:47 -0500
Subject: [PATCH] (js) Remove calls to deprecated methods

$http.success and $http.error are deprecated.
---
 .../js/Common/Authentication.service.js       |  8 +++----
 .../js/Common/Resource.service.js             | 22 ++++++++-----------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/UI/WebServerResources/js/Common/Authentication.service.js b/UI/WebServerResources/js/Common/Authentication.service.js
index 2b509ad43..600784092 100644
--- a/UI/WebServerResources/js/Common/Authentication.service.js
+++ b/UI/WebServerResources/js/Common/Authentication.service.js
@@ -122,7 +122,7 @@
               language: language,
               rememberLogin: rememberLogin
             }
-          }).success(function(data, status) {
+          }).then(function(data, status) {
             // Make sure browser's cookies are enabled
             var loginCookie = readLoginCookie();
             if (!loginCookie) {
@@ -146,7 +146,7 @@
                 d.resolve(redirectUrl(username, domain));
               }
             }
-          }).error(function(data, status) {
+          }, function(data, status) {
             var msg, perr;
             if (data && data.LDAPPasswordPolicyError) {
               perr = data.LDAPPasswordPolicyError;
@@ -179,9 +179,7 @@
               userName: loginCookie[0],
               password: loginCookie[1],
               newPassword: newPassword }
-          }).success(function(data, status) {
-            d.resolve();
-          }).error(function(data, status) {
+          }).then(d.resolve, function(data, status) {
             var error,
                 perr = data.LDAPPasswordPolicyError;
 
diff --git a/UI/WebServerResources/js/Common/Resource.service.js b/UI/WebServerResources/js/Common/Resource.service.js
index d28874279..539c7e517 100644
--- a/UI/WebServerResources/js/Common/Resource.service.js
+++ b/UI/WebServerResources/js/Common/Resource.service.js
@@ -75,11 +75,11 @@
       url: path,
       params: params
     })
-      .success(deferred.resolve)
-      .error(function(data, status) {
-        if (status == 404)
-          return deferred.reject();
-      });
+      .then(deferred.resolve,
+            function(data, status) {
+              if (status == 404)
+                return deferred.reject();
+            });
 
     return deferred.promise;
   };
@@ -96,8 +96,7 @@
 
     this._http
       .get(path)
-      .success(deferred.resolve)
-      .error(deferred.reject);
+      .then(deferred.resolve, deferred.reject);
 
     return deferred.promise;
   };
@@ -116,8 +115,7 @@
 
     this._http
       .post(path, { name: name })
-      .success(deferred.resolve)
-      .error(deferred.reject);
+      .then(deferred.resolve, deferred.reject);
 
     return deferred.promise;
   };
@@ -137,8 +135,7 @@
 
     this._http
       .post(path, data)
-      .success(deferred.resolve)
-      .error(deferred.reject);
+      .then(deferred.resolve, deferred.reject);
 
     return deferred.promise;
   };
@@ -168,8 +165,7 @@
 
     this._http
       .get(path)
-      .success(deferred.resolve)
-      .error(deferred.reject);
+      .then(deferred.resolve, deferred.reject);
 
     return deferred.promise;
   };