From c8ef5dc0e3d001b63fa381d2845b9911a932e287 Mon Sep 17 00:00:00 2001 From: Giulio Cesare Solaroli Date: Wed, 26 Aug 2015 09:20:35 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Updated=20OTP=20handling=20to=20remove=20di?= =?UTF-8?q?fference=20between=20=E2=80=98requested=E2=80=99=20and=20?= =?UTF-8?q?=E2=80=98used=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/delta/js/Clipperz/PM/Crypto.js | 2 +- frontend/delta/js/Clipperz/PM/UI/Components/CardToolbar.js | 2 -- .../delta/js/Clipperz/PM/UI/Components/ExtraFeatures/OTP.js | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/frontend/delta/js/Clipperz/PM/Crypto.js b/frontend/delta/js/Clipperz/PM/Crypto.js index 91a1683..a61f9a6 100644 --- a/frontend/delta/js/Clipperz/PM/Crypto.js +++ b/frontend/delta/js/Clipperz/PM/Crypto.js @@ -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); diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/CardToolbar.js b/frontend/delta/js/Clipperz/PM/UI/Components/CardToolbar.js index 02c7f8b..dc59f3b 100644 --- a/frontend/delta/js/Clipperz/PM/UI/Components/CardToolbar.js +++ b/frontend/delta/js/Clipperz/PM/UI/Components/CardToolbar.js @@ -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']), diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/OTP.js b/frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/OTP.js index ad76586..389cd6e 100644 --- a/frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/OTP.js +++ b/frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/OTP.js @@ -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']), ]) From eeb597354ae98d01b388bd9c759efa2445342a77 Mon Sep 17 00:00:00 2001 From: Giulio Cesare Solaroli Date: Wed, 26 Aug 2015 09:45:12 +0200 Subject: [PATCH 2/2] Fixed selection of cards with empty title --- frontend/delta/js/Clipperz/PM/UI/Components/Cards/View.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/Cards/View.js b/frontend/delta/js/Clipperz/PM/UI/Components/Cards/View.js index 25fe530..9d65eb7 100644 --- a/frontend/delta/js/Clipperz/PM/UI/Components/Cards/View.js +++ b/frontend/delta/js/Clipperz/PM/UI/Components/Cards/View.js @@ -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; },