Skip to content

Commit 4509d35

Browse files
committed
Merge pull request #289 from dpalou/MOBILE-1236
MOBILE-1236 users: Handle deleted users in 3.0+
2 parents 4be4beb + 28f8a72 commit 4509d35

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

www/core/components/user/controllers/profile.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ angular.module('mm.core.user')
2121
* @ngdoc controller
2222
* @name mmaParticipantsProfileCtrl
2323
*/
24-
.controller('mmUserProfileCtrl', function($scope, $stateParams, $mmUtil, $mmUser, $mmUserDelegate, $mmSite, $q) {
24+
.controller('mmUserProfileCtrl', function($scope, $stateParams, $mmUtil, $mmUser, $mmUserDelegate, $mmSite, $q, $translate) {
2525

2626
var courseid = $stateParams.courseid,
2727
userid = $stateParams.userid;
@@ -63,9 +63,11 @@ angular.module('mm.core.user')
6363

6464
fetchUserData().then(function() {
6565
// Add log in Moodle.
66-
$mmSite.write('core_user_view_user_profile', {
66+
return $mmSite.write('core_user_view_user_profile', {
6767
userid: userid,
6868
courseid: courseid
69+
}).catch(function(error) {
70+
$scope.isDeleted = error === $translate.instant('mm.core.userdeleted');
6971
});
7072
}).finally(function() {
7173
$scope.userLoaded = true;

www/core/components/user/templates/profile.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ion-content padding="true">
44
<ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="userLoaded" on-refresh="refreshUser()"></ion-refresher>
55
<mm-loading hide-until="userLoaded">
6-
<div class="list" ng-if="user">
6+
<div class="list" ng-if="user && !isDeleted">
77
<div class="item item-avatar">
88
<img ng-if="user.profileimageurl" ng-src="{{user.profileimageurl}}" mm-external-content alt="" role="presentation">
99
<img ng-if="!user.profileimageurl" src="img/user-avatar.png" alt="" role="presentation">
@@ -99,9 +99,13 @@ <h2>{{ 'mm.user.description' | translate}}</h2>
9999
</div>
100100
</div>
101101

102-
<div ng-if="!user">
102+
<div ng-if="!user && !isDeleted">
103103
{{ 'mm.user.detailsnotavailable' | translate }}
104104
</div>
105+
106+
<div ng-if="isDeleted">
107+
{{ 'mm.core.userdeleted' | translate }}
108+
</div>
105109
</mm-loading>
106110
</ion-content>
107111
</ion-view>

0 commit comments

Comments
 (0)