Sync resolution suggest sign out

This commit is contained in:
Mo Bitar
2019-02-12 15:17:16 -06:00
parent c7d913f7ad
commit f9b9f530e1

View File

@@ -6,15 +6,23 @@
.sk-panel-content .sk-panel-content
.sk-panel-section .sk-panel-section
.sk-panel-row .sk-panel-row.sk-p
.sk-p
We've detected that the data on the server may not match the data in the current application session. We've detected that the data on the server may not match the data in the current application session.
We will attempt to reconcile changes by downloading all data from the server.
.sk-p.sk-panel-row
.sk-panel-column
%strong.sk-panel-row Option 1 (recommended) — Sign Out:
.sk-p Sign out of your account, then sign back in. This will ensure your data is consistent with the server.
Be sure to download a backup of your data before doing so.
.sk-p.sk-panel-row
.sk-panel-column
%strong.sk-panel-row Option 2 — Sync Resolution:
.sk-p We can attempt to reconcile changes by downloading all data from the server.
No existing data will be overwritten. If the local contents of an item differ from what the server has, No existing data will be overwritten. If the local contents of an item differ from what the server has,
a conflicted copy will be created. a conflicted copy will be created.
.sk-panel-section{"ng-if" => "!status.backupFinished"} %div{"ng-if" => "!status.backupFinished"}
.sk-panel-row .sk-p.sk-panel-row
Please download a backup before we attempt to perform a full account sync resolution. Please download a backup before we attempt to perform a full account sync resolution.
.sk-panel-row .sk-panel-row
.sk-button-group .sk-button-group
@@ -25,7 +33,7 @@
.sk-button.danger{"ng-click" => "skipBackup()"} .sk-button.danger{"ng-click" => "skipBackup()"}
.sk-label Skip .sk-label Skip
.sk-panel-section{"ng-if" => "status.backupFinished"} %div{"ng-if" => "status.backupFinished"}
.sk-panel-row{"ng-if" => "!status.resolving && !status.attemptedResolution"} .sk-panel-row{"ng-if" => "!status.resolving && !status.attemptedResolution"}
.sk-button.info{"ng-click" => "performSyncResolution()"} .sk-button.info{"ng-click" => "performSyncResolution()"}
.sk-label Perform Sync Resolution .sk-label Perform Sync Resolution