Merge pull request #504 from khoa-nd/master

Merged
chrisshayan · Jan 22, 2016 · beafe64 · beafe64
2 parents 51195b8 + ae178ff
commit beafe64
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js b/src/main/webapp/assets/modules/common/challenge/submissionChallenge.js
@@ -100,6 +100,7 @@ techlooper.directive("submissionChallenge", function (localStorageService, apiSe
                 })
                 .error(function () {
                   scope.submissionForm.submissionPassCode.$setValidity("credential", false);
+                  delete scope.loadingData;
                 });
             }
             scope.submissionForm && scope.submissionForm.submissionURL.$setValidity("invalidUrl", !inValid);

diff --git a/src/main/webapp/assets/modules/navigation/employer-header.tem.html b/src/main/webapp/assets/modules/navigation/employer-header.tem.html
@@ -14,7 +14,7 @@ <h1><a ng-href="#/{{state('home-url')}}"> <img src="images/logo-small.svg" alt="
       <div class="user-info-basic-block">
         <a ng-click="logout()" ng-show="$root.userInfo" translate="signOut"></a>
         <a href="#/home" translate="techTalent" class="homepage-link"></a>
-        <p>{{$root.userInfo.name}}</p>
+        <p>{{($root.userInfo.name | textTruncate: 'display-text') || ($root.userInfo.username | textTruncate: 'email')}}</p>
         <div class="user-avatar" ng-show="$root.userInfo">
           <img ng-src="{{$root.userInfo.profileImageUrl}}" alt="" ng-show="$root.userInfo.profileImageUrl.length">
           <img src="images/no-avatar.png" alt="" ng-show="!$root.userInfo.profileImageUrl.length"/>