summaryrefslogtreecommitdiff
path: root/web-ui/app/js
diff options
context:
space:
mode:
authorThais Siqueira <thais.siqueira@gmail.com>2016-07-11 15:39:07 -0300
committerThais Siqueira <thais.siqueira@gmail.com>2016-07-11 15:39:07 -0300
commit0c236ef90dec7caeb09bd407b0c33a0d0db2ef80 (patch)
tree155c750ff32f04aa4fff7f2556d9a86d6841358f /web-ui/app/js
parent8897c7b203aaaa4ae7cc175c61b7105ebc7488ac (diff)
Fix encrypted label
The encryption status was being wrongly displayed as "encrypted encryption-valid" with a green padlock See: #619
Diffstat (limited to 'web-ui/app/js')
-rw-r--r--web-ui/app/js/mail_view/ui/mail_view.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/web-ui/app/js/mail_view/ui/mail_view.js b/web-ui/app/js/mail_view/ui/mail_view.js
index 6f57236e..b5a5f632 100644
--- a/web-ui/app/js/mail_view/ui/mail_view.js
+++ b/web-ui/app/js/mail_view/ui/mail_view.js
@@ -104,22 +104,22 @@ define(
}
var statusClass = ['security-status__label--encrypted'];
- var statusLabel = ['encrypted'];
+ var statusLabel;
var hasAnyEncryptionInfo = _.any(mail.security_casing.locks, function (lock) {
return lock.state === 'valid';
});
if(hasAnyEncryptionInfo) {
- statusLabel.push('encryption-valid');
+ statusLabel = 'encrypted';
} else {
statusClass.push('--with-error');
- statusLabel.push('encryption-error');
+ statusLabel = 'encryption-error';
}
return {
cssClass: statusClass.join(''),
- label: statusLabel.join(' ')
+ label: statusLabel
};
};