clipperz
/
password-manager-mirror
mirror of http://git.whoc.org.uk/git/password-manager.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #83 from gcsolaroli/master 

Updated OTP handling to remove difference between ‘requested’ and ‘used’
master-GE
Giulio Cesare Solaroli 2015-08-26 15:21:28 +02:00
parent 16d3e14f38 eeb597354a
commit e302b2688f
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/delta/js/Clipperz/PM/Crypto.js
View File

@ -105,7 +105,7 @@ MochiKit.Base.update(Clipperz.PM.Crypto, {
'hash': function(aValue) {
var result;
var strngResult;
var stringResult;
stringResult = Clipperz.Crypto.Base.computeHashValue(aValue.asString()); // !!!!!!!
result = new Clipperz.ByteArray("0x" + stringResult);

2
frontend/delta/js/Clipperz/PM/UI/Components/CardToolbar.js
View File

@ -96,9 +96,7 @@ Clipperz.PM.UI.Components.CardToolbarClass = React.createClass({
},
render: function () {
//console.log("CardToolbar props", this.props);
return React.DOM.div({className:'cardToolbar ' + this.props['style']}, [
// React.DOM.div({className:'header'}, this.props['enableSidePanels'] ? this.renderWithSidePanels() : this.renderWithoutSidePanels()),
React.DOM.header({}, this.props['enableSidePanels'] ? this.renderWithSidePanels() : this.renderWithoutSidePanels()),
Clipperz.PM.UI.Components.AccountStatus(MochiKit.Base.update(this.props['accountInfo'], this.props['proxyInfo'])),
Clipperz.PM.UI.Components.MessageBox(this.props['messageBox']),

4
frontend/delta/js/Clipperz/PM/UI/Components/Cards/View.js
View File

@ -276,12 +276,12 @@ Clipperz.PM.UI.Components.Cards.ViewClass = React.createClass({
if (this.props['loading'] == true) {
result = this.renderLoading();
} else if (this.props['label']) {
} else if (this.props['_reference']) {
result = this.renderCard();
} else {
result = this.renderEmpty();
}
return result;
},

2
frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/OTP.js
View File

@ -168,7 +168,7 @@ Clipperz.PM.UI.Components.ExtraFeatures.OTPClass = React.createClass({
if (otpDetailInfo['status'] != 'ACTIVE') {
otpStatusInfo = React.DOM.div({'className':'otpStatusInfo'}, [
React.DOM.span({'className':'otpStatus'}, otpDetailInfo['status']),
React.DOM.span({'className':'requestDate'}, otpDetailInfo['requestDate']),
React.DOM.span({'className':'requestDate'}, otpDetailInfo['usageDate']),
React.DOM.span({'className':'connectionIp'}, otpDetailInfo['connection']['ip']),
React.DOM.span({'className':'connectionBrowser'}, otpDetailInfo['connection']['browser']),
])