Skip to content

Commit

Permalink
Merge pull request #4474 from ErisDS/profilefix
Browse files Browse the repository at this point in the history
Fixing logic for editors deleting themselves
  • Loading branch information
sebgie committed Nov 18, 2014
2 parents 09bd71f + 7317259 commit 312a0fb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion core/client/views/settings/users/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var SettingsUserView = Ember.View.extend({

deleteUserActionIsVisible: Ember.computed('currentUser', 'canAssignRoles', 'controller.user', function () {
if ((this.get('canAssignRoles') && this.get('isNotOwnProfile') && !this.get('controller.user.isOwner')) ||
(this.get('currentUser.isEditor') && (!this.get('isNotOwnProfile') ||
(this.get('currentUser.isEditor') && (this.get('isNotOwnProfile') ||
this.get('controller.user.isAuthor')))) {
return true;
}
Expand Down

0 comments on commit 312a0fb

Please sign in to comment.