unique username, email directives fixed

Author: taleksashina

src/main/webapp/js/directives.js

@@ -223,8 +223,8 @@ app.directive('uniqueUserName', ['$compile', 'UsersService', function($compile,
          restrict: 'A',
          require: 'ngModel',
          link: function(scope, elem, attr, ngModel) {
-           var list = UsersService.getUserNames();
            ngModel.$parsers.unshift(function (value) {
+             var list = UsersService.getUserNames();
              ngModel.$setValidity('uniqueUserName', list.indexOf(value) === -1);
              return value;
            });
@@ -237,8 +237,8 @@ app.directive('uniqueEmail', ['$compile', 'UsersService', function($compile, Use
          restrict: 'A',
          require: 'ngModel',
          link: function(scope, elem, attr, ngModel) {
-           var list = UsersService.getEmails();
            ngModel.$parsers.unshift(function (value) {
+             var list = UsersService.getEmails();
              ngModel.$setValidity('uniqueEmail', list.indexOf(value) === -1);
              return value;
            });

src/main/webapp/js/services/users-service.js

@@ -21,6 +21,8 @@ module.factory("UsersService", function($http, Config, AccountService) {
         };
         return $http.post("RdfStoreProxy", $.param(requestData)).then(function(response) {
             var parsedResult = Config.parseSparqlResults(response.data);
+            userNames = [];
+            emails = [];
             for (var ind in parsedResult) {
                 userNames.push(parsedResult[ind]["foaf:accountName"][0]);
                 emails.push(parsedResult[ind]["foaf:mbox"][0].replace("mailto:",""));
@@ -44,13 +46,17 @@ module.factory("UsersService", function($http, Config, AccountService) {
         };
         return $http.post("UserManagerServlet", $.param(requestData)).then(function(response) {
             users = response.data;
+            userNames = [];
+            emails = [];
             var ns = Config.getFrameworkOntologyNS();
             for (var ind in users) {
                 users[ind].profile.accountURI = users[ind].profile.accountURI.replace(Config.getNS(), ":");
                 users[ind].profile.role.uri = users[ind].profile.role.uri.replace(ns, "gkg:");
                 for (var sind in users[ind].profile.role.services) {
                     users[ind].profile.role.services[sind] = users[ind].profile.role.services[sind].replace(Config.getNS(), ":");
                 }
+                userNames.push(users[ind].profile.username);
+                emails.push(users[ind].profile.email.replace("mailto:",""));
             }
             return users;
         });