|
@@ -619,10 +619,10 @@
|
|
|
<button type="button" class="btn btn-sm btn-danger pull-left" ng-click="revertOverrideConfirmationModal('override', folder.id)" ng-if="folderStatus(folder) == 'outofsync' && folder.type == 'sendonly'">
|
|
|
<span class="fas fa-arrow-circle-up"></span> <span translate>Override Changes</span>
|
|
|
</button>
|
|
|
- <button type="button" class="btn btn-sm btn-danger pull-left" ng-click="revertOverrideConfirmationModal('revert', folder.id)" ng-if="hasReceiveOnlyChanged(folder)">
|
|
|
+ <button type="button" class="btn btn-sm btn-danger pull-left" ng-click="revertOverrideConfirmationModal('revert', folder.id)" ng-if="hasReceiveOnlyChanged(folder) && ['outofsync', 'faileditems', 'localadditions'].indexOf(folderStatus(folder)) >= 0">
|
|
|
<span class="fa fa-arrow-circle-down"></span> <span translate>Revert Local Changes</span>
|
|
|
</button>
|
|
|
- <button type="button" class="btn btn-sm btn-danger pull-left" ng-click="revertOverrideConfirmationModal('deleteEnc', folder.id)" ng-if="hasReceiveEncryptedItems(folder)">
|
|
|
+ <button type="button" class="btn btn-sm btn-danger pull-left" ng-click="revertOverrideConfirmationModal('deleteEnc', folder.id)" ng-if="hasReceiveEncryptedItems(folder) && ['outofsync', 'faileditems', 'localunencrypted'].indexOf(folderStatus(folder)) >= 0">
|
|
|
<span class="fa fa-minus-circle"></span> <span translate>Delete Unexpected Items</span>
|
|
|
</button>
|
|
|
<span class="pull-right">
|