Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix: Can not view OpenPGP key (#1200)

Browse source
This commit is contained in:
RainLoop Team 2016-09-30 16:42:38 +03:00
parent 0bbb2f14a4
commit 760d9e6243
2 changed files with 92 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dev/View/Popup/ViewOpenPgpKey.js
View file

@ -10,7 +10,7 @@ import {AbstractViewNext} from 'Knoin/AbstractViewNext';
@popup({ @popup({
name: 'View/Popup/ViewOpenPgpKey', name: 'View/Popup/ViewOpenPgpKey',
templateID: 'PopupsTwoFactorTest' templateID: 'PopupsViewOpenPgpKey'
}) })
class ViewOpenPgpKeyPopupView extends AbstractViewNext class ViewOpenPgpKeyPopupView extends AbstractViewNext
{ {
@ -35,12 +35,12 @@ class ViewOpenPgpKeyPopupView extends AbstractViewNext
} }
} }
onShow(oOpenPgpKey) { onShow(openPgpKey) {
this.clearPopup(); this.clearPopup();
if (oOpenPgpKey) if (openPgpKey)
{ {
this.key(oOpenPgpKey.armor); this.key(openPgpKey.armor);
} }
} }

10
rainloop/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html
View file

@ -38,17 +38,17 @@
<div class="open-pgp-key-user-address" data-bind="text: $data"></div> <div class="open-pgp-key-user-address" data-bind="text: $data"></div>
<!-- /ko --> <!-- /ko -->
</span> </span>
<a class="btn btn-small btn-small-small btn-danger pull-right button-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(oOpenPGP) { $root.deleteOpenPgpKey(oOpenPGP); }"> <a class="btn btn-small btn-small-small btn-danger pull-right button-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(openPgpKey) { $root.deleteOpenPgpKey(openPgpKey); }">
<span class="i18n" data-i18n="SETTINGS_OPEN_PGP/DELETING_ASK"></span> <span class="i18n" data-i18n="SETTINGS_OPEN_PGP/DELETING_ASK"></span>
</a> </a>
</td> </td>
<td> <td>
<span class="delete-open-pgp-key" data-bind="visible: !deleteAccess(), click: function (oOpenPGP) { $root.openPgpKeyForDeletion(oOpenPGP); }"> <span class="delete-open-pgp-key" data-bind="visible: !deleteAccess(), click: function (openPgpKey) { $root.openPgpKeyForDeletion(openPgpKey); }">
<i class="icon-trash"></i> <i class="icon-trash"></i>
</span> </span>
</td> </td>
<td> <td>
<span class="view-open-pgp-key" data-bind="click: function (oOpenPgpKey) { $root.viewOpenPgpKey(oOpenPgpKey); }"> <span class="view-open-pgp-key" data-bind="click: function (openPgpKey) { $root.viewOpenPgpKey(openPgpKey); }">
<i class="icon-eye"></i> <i class="icon-eye"></i>
</span> </span>
</td> </td>
@ -72,12 +72,12 @@
</a> </a>
</td> </td>
<td> <td>
<span class="delete-open-pgp-key" data-bind="visible: !deleteAccess(), click: function (oOpenPgpKey) { $root.openPgpKeyForDeletion(oOpenPgpKey); }"> <span class="delete-open-pgp-key" data-bind="visible: !deleteAccess(), click: function (openPgpKey) { $root.openPgpKeyForDeletion(openPgpKey); }">
<i class="icon-trash"></i> <i class="icon-trash"></i>
</span> </span>
</td> </td>
<td> <td>
<span class="view-open-pgp-key" data-bind="click: function (oOpenPgpKey) { $root.viewOpenPgpKey(oOpenPgpKey); }"> <span class="view-open-pgp-key" data-bind="click: function (openPgpKey) { $root.viewOpenPgpKey(openPgpKey); }">
<i class="icon-eye"></i> <i class="icon-eye"></i>
</span> </span>
</td> </td>