rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Alert on failed action

Browse Source
This commit is contained in:
Mo Bitar
2019-04-04 16:16:43 -05:00
parent 9bd4e5e5a1
commit 5d949d5200
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/app/services/actionsManager.js
View File

@@ -127,6 +127,9 @@ class ActionsManager {
action.error = false; action.error = false;
handleResponseDecryption(response, await this.authManager.keys(), true); handleResponseDecryption(response, await this.authManager.keys(), true);
}, (response) => { }, (response) => {
if(response && response.error) {
alert("An issue occurred while processing this action. Please try again.");
}
action.error = true; action.error = true;
customCallback(null); customCallback(null);
}) })
@@ -159,7 +162,10 @@ class ActionsManager {
items: [itemParams] // Wrap it in an array items: [itemParams] // Wrap it in an array
} }
this.performPost(action, extension, params, function(response){ this.performPost(action, extension, params, (response) => {
if(response && response.error) {
alert("An issue occurred while processing this action. Please try again.");
}
customCallback(response); customCallback(response);
}); });
}) })

7
app/assets/templates/directives/password-wizard.html.haml
View File

@@ -19,9 +19,10 @@
%p.sk-p.sk-panel-row %p.sk-p.sk-panel-row
A new update is available for your account. Updates address improvements and enhancements to our security specification. A new update is available for your account. Updates address improvements and enhancements to our security specification.
This process will guide you through the update, and perform the steps necessary with your supervision. This process will guide you through the update, and perform the steps necessary with your supervision.
%p.sk-p.sk-panel-row .sk-panel-row
For more information about security updates, please visit .sk-panel-column
%a.sk-a.info{"href" => "https://standardnotes.org/help/security", "target" => "_blank"} standardnotes.org/help/security. %p.sk-p For more information about security updates, please visit
%a.sk-a.info{"href" => "https://standardnotes.org/help/security", "target" => "_blank"} standardnotes.org/help/security.
%p.sk-panel-row.sk-p %p.sk-panel-row.sk-p
.info Press Continue to proceed. .info Press Continue to proceed.