diff options
| -rw-r--r-- | gui/default/index.html | 10 | ||||
| -rwxr-xr-x | gui/default/syncthing/core/syncthingController.js | 9 |
2 files changed, 17 insertions, 2 deletions
diff --git a/gui/default/index.html b/gui/default/index.html index 26f4e8655..5a825a7e6 100644 --- a/gui/default/index.html +++ b/gui/default/index.html @@ -587,7 +587,10 @@ <th><span class="fas fa-fw fa-share-alt"></span> <span translate>Shared With</span></th> <td class="text-right no-overflow-ellipse overflow-break-word"> <span ng-repeat="device in otherDevices(folder.devices)"> - <span ng-switch="completion[device.deviceID][folder.id].remoteState"><!-- Avoid stray space... + <span ng-if="folder.type !== 'receiveencrypted' && device.encryptionPassword" class="text-nowrap"> + <span class="fa fa-lock"></span> <!-- Avoid stray space... + --></span><!-- Avoid stray space... + --><span ng-switch="completion[device.deviceID][folder.id].remoteState"><!-- Avoid stray space... --><span ng-switch-when="notSharing" data-original-title="{{'The remote device has not accepted sharing this folder.' | translate}}" tooltip>{{deviceName(devices[device.deviceID])}}<sup>1</sup></span><!-- Avoid stray space... --><span ng-switch-when="paused" data-original-title="{{'The remote device has paused this folder.' | translate}}" tooltip>{{deviceName(devices[device.deviceID])}}<sup>2</sup></span><!-- Avoid stray space... --><span ng-switch-default>{{deviceName(devices[device.deviceID])}}</span><!-- Avoid stray space... @@ -943,7 +946,10 @@ <th><span class="fas fa-fw fa-folder"></span> <span translate>Folders</span></th> <td class="text-right no-overflow-ellipse overflow-break-word"> <span ng-repeat="folderID in deviceFolders(deviceCfg)"> - <span ng-switch="completion[deviceCfg.deviceID][folderID].remoteState"><!-- Avoid stray space... + <span ng-if="folderIsSharedEncrypted(folderID, deviceCfg.deviceID)" class="text-nowrap"> + <span class="fa fa-lock"></span> <!-- Avoid stray space... + --></span><!-- Avoid stray space... + --><span ng-switch="completion[deviceCfg.deviceID][folderID].remoteState"><!-- Avoid stray space... --><span ng-switch-when="notSharing" data-original-title="{{'The remote device has not accepted sharing this folder.' | translate}}" tooltip>{{folderLabel(folderID)}}<sup>1</sup></span><!-- Avoid stray space... --><span ng-switch-when="paused" data-original-title="{{'The remote device has paused this folder.' | translate}}" tooltip>{{folderLabel(folderID)}}<sup>2</sup></span><!-- Avoid stray space... --><span ng-switch-default>{{folderLabel(folderID)}}</span><!-- Avoid stray space... diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js index 54b0a96ee..51f08d050 100755 --- a/gui/default/syncthing/core/syncthingController.js +++ b/gui/default/syncthing/core/syncthingController.js @@ -2662,6 +2662,15 @@ angular.module('syncthing.core') + '&device=' + encodeURIComponent(deviceID)); }; + $scope.folderIsSharedEncrypted = function (folderID, deviceID) { + var folderCfg = $scope.folders[folderID]; + if (!folderCfg || folderCfg.type === 'receiveencrypted') return false; + + return folderCfg.devices.some(function (device) { + return device.deviceID === deviceID && device.encryptionPassword !== ''; + }); + }; + $scope.folderHasUnacceptedDevices = function (folderCfg) { for (var deviceID in $scope.completion) { if (deviceID in $scope.devices |