all: Automatic/disabled folder-config when receive-encrypted (#7327)

This commit is contained in:
Simon Frei
2021-02-12 22:51:29 +01:00
committed by GitHub
parent 7e4e2f3720
commit 80fc238bec
13 changed files with 221 additions and 130 deletions
+1 -1
View File
@@ -250,7 +250,7 @@
</div>
<div class="panel-footer clearfix">
<div class="pull-right">
<button type="button" class="btn btn-sm btn-success" ng-click="addFolderAndShare(folderID, offeringDevice.label, deviceID)" ng-if="!folders[folderID]">
<button type="button" class="btn btn-sm btn-success" ng-click="addFolderAndShare(folderID, pendingFolder, deviceID)" ng-if="!folders[folderID]">
<span class="fas fa-check"></span>&nbsp;<span translate>Add</span>
</button>
<button type="button" class="btn btn-sm btn-success" ng-click="shareFolderWithDevice(folderID, deviceID)" ng-if="folders[folderID]">