octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-03 15:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

gui: Refactor to make encryption diff smaller (#7049)

Browse Source
This commit is contained in:
Simon Frei 2020-10-23 08:27:02 +02:00 committed by GitHub
parent f0f60ba2e7
commit a20d85d451
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 106 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gui/default/index.html
View File

@ -204,10 +204,10 @@
</div> </div>
<div class="panel-body"> <div class="panel-body">
<p> <p>
<span ng-if="pendingFolder.label.length == 0" translate translate-value-device="{{ deviceName(findDevice(device.deviceID)) }}" translate-value-folder="{{ pendingFolder.id }}"> <span ng-if="pendingFolder.label.length == 0" translate translate-value-device="{{ deviceName(devices[device.deviceID]) }}" translate-value-folder="{{ pendingFolder.id }}">
{%device%} wants to share folder "{%folder%}". {%device%} wants to share folder "{%folder%}".
</span> </span>
<span ng-if="pendingFolder.label.length != 0" translate translate-value-device="{{ deviceName(findDevice(device.deviceID)) }}" translate-value-folder="{{ pendingFolder.id }}" translate-value-folderlabel="{{ pendingFolder.label }}"> <span ng-if="pendingFolder.label.length != 0" translate translate-value-device="{{ deviceName(devices[device.deviceID]) }}" translate-value-folder="{{ pendingFolder.id }}" translate-value-folderlabel="{{ pendingFolder.label }}">
{%device%} wants to share folder "{%folderlabel%}" ({%folder%}). {%device%} wants to share folder "{%folderlabel%}" ({%folder%}).
</span> </span>
<span translate ng-if="folders[pendingFolder.id]">Share this folder?</span> <span translate ng-if="folders[pendingFolder.id]">Share this folder?</span>
@ -753,7 +753,7 @@
</tr> </tr>
<tr ng-if="deviceCfg.introducedBy"> <tr ng-if="deviceCfg.introducedBy">
<th><span class="far fa-fw fa-handshake-o"></span>&nbsp;<span translate>Introduced By</span></th> <th><span class="far fa-fw fa-handshake-o"></span>&nbsp;<span translate>Introduced By</span></th>
<td class="text-right">{{ deviceName(findDevice(deviceCfg.introducedBy)) || deviceCfg.introducedBy.substring(0, 5) }}</td> <td class="text-right">{{ deviceName(devices[deviceCfg.introducedBy]) || deviceCfg.introducedBy.substring(0, 5) }}</td>
</tr> </tr>
<tr ng-if="connections[deviceCfg.deviceID].clientVersion"> <tr ng-if="connections[deviceCfg.deviceID].clientVersion">
<th><span class="fas fa-fw fa-tag"></span>&nbsp;<span translate>Version</span></th> <th><span class="fas fa-fw fa-tag"></span>&nbsp;<span translate>Version</span></th>

9
gui/default/syncthing/app.js
View File

@ -74,6 +74,15 @@ function deviceMap(l) {
return m; return m;
} }
function deviceList(m) {
var l = [];
for (var id in m) {
l.push(m[id]);
}
l.sort(deviceCompare);
return l;
}
function folderMap(l) { function folderMap(l) {
var m = {}; var m = {};
l.forEach(function (r) { l.forEach(function (r) {

196
gui/default/syncthing/core/syncthingController.js
View File

@ -27,7 +27,7 @@ angular.module('syncthing.core')
$scope.errors = []; $scope.errors = [];
$scope.model = {}; $scope.model = {};
$scope.myID = ''; $scope.myID = '';
$scope.devices = []; $scope.devices = {};
$scope.discoveryCache = {}; $scope.discoveryCache = {};
$scope.protocolChanged = false; $scope.protocolChanged = false;
$scope.reportData = {}; $scope.reportData = {};
@ -63,9 +63,6 @@ angular.module('syncthing.core')
$scope.folderDefaults = { $scope.folderDefaults = {
devices: [], devices: [],
sharedDevices: {},
selectedDevices: {},
unrelatedDevices: {},
type: "sendreceive", type: "sendreceive",
rescanIntervalS: 3600, rescanIntervalS: 3600,
fsWatcherDelayS: 10, fsWatcherDelayS: 10,
@ -378,15 +375,14 @@ angular.module('syncthing.core')
$scope.config.options._globalAnnounceServersStr = $scope.config.options.globalAnnounceServers.join(', '); $scope.config.options._globalAnnounceServersStr = $scope.config.options.globalAnnounceServers.join(', ');
$scope.config.options._urAcceptedStr = "" + $scope.config.options.urAccepted; $scope.config.options._urAcceptedStr = "" + $scope.config.options.urAccepted;
$scope.devices = $scope.config.devices; $scope.devices = deviceMap($scope.config.devices);
$scope.devices.forEach(function (deviceCfg) { for (var id in $scope.devices) {
$scope.completion[deviceCfg.deviceID] = { $scope.completion[id] = {
_total: 100, _total: 100,
_needBytes: 0, _needBytes: 0,
_needItems: 0 _needItems: 0
}; };
}); };
$scope.devices.sort(deviceCompare);
$scope.folders = folderMap($scope.config.folders); $scope.folders = folderMap($scope.config.folders);
Object.keys($scope.folders).forEach(function (folder) { Object.keys($scope.folders).forEach(function (folder) {
refreshFolder(folder); refreshFolder(folder);
@ -689,6 +685,14 @@ angular.module('syncthing.core')
}); });
}; };
function initShareEditing(editing) {
$scope.currentSharing = {};
$scope.currentSharing.editing = editing;
$scope.currentSharing.shared = [];
$scope.currentSharing.unrelated = [];
$scope.currentSharing.selected = {};
};
$scope.refreshFailed = function (page, perpage) { $scope.refreshFailed = function (page, perpage) {
if (!$scope.failed || !$scope.failed.folder) { if (!$scope.failed || !$scope.failed.folder) {
return; return;
@ -1007,11 +1011,11 @@ angular.module('syncthing.core')
} }
// loop through all devices // loop through all devices
var deviceCount = $scope.devices.length; var deviceCount = 0;
var pendingFolders = 0; var pendingFolders = 0;
for (var i = 0; i < $scope.devices.length; i++) { for (var id in $scope.devices) {
var status = $scope.deviceStatus({ var status = $scope.deviceStatus({
deviceID: $scope.devices[i].deviceID deviceID: id
}); });
switch (status) { switch (status) {
case 'unknown': case 'unknown':
@ -1024,7 +1028,8 @@ angular.module('syncthing.core')
deviceCount--; deviceCount--;
break; break;
} }
pendingFolders += $scope.devices[i].pendingFolders.length; pendingFolders += $scope.devices[id].pendingFolders.length;
deviceCount++;
} }
// enumerate notifications // enumerate notifications
@ -1061,8 +1066,8 @@ angular.module('syncthing.core')
}; };
$scope.friendlyNameFromShort = function (shortID) { $scope.friendlyNameFromShort = function (shortID) {
var matches = $scope.devices.filter(function (n) { var matches = Object.keys($scope.devices).filter(function (id) {
return n.deviceID.substr(0, 7) === shortID; return id.substr(0, 7) === shortID;
}); });
if (matches.length !== 1) { if (matches.length !== 1) {
return shortID; return shortID;
@ -1071,23 +1076,13 @@ angular.module('syncthing.core')
}; };
$scope.friendlyNameFromID = function (deviceID) { $scope.friendlyNameFromID = function (deviceID) {
var match = $scope.findDevice(deviceID); var match = $scope.devices[deviceID];
if (match) { if (match) {
return $scope.deviceName(match); return $scope.deviceName(match);
} }
return deviceID.substr(0, 6); return deviceID.substr(0, 6);
}; };
$scope.findDevice = function (deviceID) {
var matches = $scope.devices.filter(function (n) {
return n.deviceID === deviceID;
});
if (matches.length !== 1) {
return undefined;
}
return matches[0];
};
$scope.deviceName = function (deviceCfg) { $scope.deviceName = function (deviceCfg) {
if (typeof deviceCfg === 'undefined' || typeof deviceCfg.deviceID === 'undefined') { if (typeof deviceCfg === 'undefined' || typeof deviceCfg.deviceID === 'undefined') {
return ""; return "";
@ -1110,12 +1105,8 @@ angular.module('syncthing.core')
}; };
$scope.setDevicePause = function (device, pause) { $scope.setDevicePause = function (device, pause) {
$scope.devices.forEach(function (cfg) { $scope.devices[id].paused = pause;
if (cfg.deviceID == device) { $scope.config.devices = $scope.deviceList();
cfg.paused = pause;
}
});
$scope.config.devices = $scope.devices;
$scope.saveConfig(); $scope.saveConfig();
}; };
@ -1344,7 +1335,7 @@ angular.module('syncthing.core')
// at it before that and conclude that the settings are // at it before that and conclude that the settings are
// modified (even though we just saved) unless we update // modified (even though we just saved) unless we update
// here as well... // here as well...
$scope.devices = $scope.config.devices; $scope.devices = deviceMap($scope.config.devices);
$scope.saveConfig(function () { $scope.saveConfig(function () {
if (themeChanged) { if (themeChanged) {
@ -1410,45 +1401,45 @@ angular.module('syncthing.core')
$scope.editingExisting = true; $scope.editingExisting = true;
$scope.willBeReintroducedBy = undefined; $scope.willBeReintroducedBy = undefined;
if (deviceCfg.introducedBy) { if (deviceCfg.introducedBy) {
var introducerDevice = $scope.findDevice(deviceCfg.introducedBy); var introducerDevice = $scope.devices[deviceCfg.introducedBy];
if (introducerDevice && introducerDevice.introducer) { if (introducerDevice && introducerDevice.introducer) {
$scope.willBeReintroducedBy = $scope.deviceName(introducerDevice); $scope.willBeReintroducedBy = $scope.deviceName(introducerDevice);
} }
} }
$scope.currentDevice._addressesStr = deviceCfg.addresses.join(', '); $scope.currentDevice._addressesStr = deviceCfg.addresses.join(', ');
$scope.currentDevice.selectedFolders = {}; initShareEditing('device');
$scope.currentSharing.selected = {};
$scope.deviceFolders($scope.currentDevice).forEach(function (folder) { $scope.deviceFolders($scope.currentDevice).forEach(function (folder) {
$scope.currentDevice.selectedFolders[folder] = true; $scope.currentSharing.selected[folder] = true;
}); });
$scope.deviceEditor.$setPristine(); $scope.deviceEditor.$setPristine();
$('#editDevice').modal(); $('#editDevice').modal();
}; };
$scope.selectAllFolders = function () { $scope.selectAllSharedFolders = function (state) {
angular.forEach($scope.folders, function (_, id) { var devices = $scope.currentSharing.shared;
$scope.currentDevice.selectedFolders[id] = true; for (var i = 0; i < devices.length; i++) {
}); $scope.currentSharing.selected[devices[i].deviceID] = !!state;
}
}; };
$scope.deSelectAllFolders = function () { $scope.selectAllUnrelatedFolders = function (state) {
angular.forEach($scope.folders, function (_, id) { var devices = $scope.currentSharing.unrelated;
$scope.currentDevice.selectedFolders[id] = false; for (var i = 0; i < devices.length; i++) {
}); $scope.currentSharing.selected[devices[i].deviceID] = !!state;
}
}; };
$scope.addDevice = function (deviceID, name) { $scope.addDevice = function (deviceID, name) {
return $http.get(urlbase + '/system/discovery') return $http.get(urlbase + '/system/discovery')
.success(function (registry) { .success(function (registry) {
$scope.discovery = []; $scope.discovery = [];
outer:
for (var id in registry) { for (var id in registry) {
if ($scope.discovery.length === 5) { if ($scope.discovery.length === 5) {
break; break;
} }
for (var i = 0; i < $scope.devices.length; i++) { if (id in $scope.devices) {
if ($scope.devices[i].deviceID === id) { continue
continue outer;
}
} }
$scope.discovery.push(id); $scope.discovery.push(id);
} }
@ -1460,7 +1451,6 @@ angular.module('syncthing.core')
_addressesStr: 'dynamic', _addressesStr: 'dynamic',
compression: 'metadata', compression: 'metadata',
introducer: false, introducer: false,
selectedFolders: {},
pendingFolders: [], pendingFolders: [],
ignoredFolders: [] ignoredFolders: []
}; };
@ -1476,10 +1466,8 @@ angular.module('syncthing.core')
return; return;
} }
$scope.devices = $scope.devices.filter(function (n) { delete $scope.devices[id];
return n.deviceID !== $scope.currentDevice.deviceID; $scope.config.devices = $scope.deviceList();
});
$scope.config.devices = $scope.devices;
for (var id in $scope.folders) { for (var id in $scope.folders) {
$scope.folders[id].devices = $scope.folders[id].devices.filter(function (n) { $scope.folders[id].devices = $scope.folders[id].devices.filter(function (n) {
@ -1500,23 +1488,11 @@ angular.module('syncthing.core')
return x.trim(); return x.trim();
}); });
var done = false; $scope.devices[deviceCfg.deviceID] = deviceCfg;
for (var i = 0; i < $scope.devices.length && !done; i++) { $scope.config.devices = deviceList($scope.devices);
if ($scope.devices[i].deviceID === deviceCfg.deviceID) {
$scope.devices[i] = deviceCfg;
done = true;
}
}
if (!done) { for (var id in $scope.currentSharing.selected) {
$scope.devices.push(deviceCfg); if ($scope.currentSharing.selected[id]) {
}
$scope.devices.sort(deviceCompare);
$scope.config.devices = $scope.devices;
for (var id in deviceCfg.selectedFolders) {
if (deviceCfg.selectedFolders[id]) {
var found = false; var found = false;
for (i = 0; i < $scope.folders[id].devices.length; i++) { for (i = 0; i < $scope.folders[id].devices.length; i++) {
if ($scope.folders[id].devices[i].deviceID === deviceCfg.deviceID) { if ($scope.folders[id].devices[i].deviceID === deviceCfg.deviceID) {
@ -1574,13 +1550,13 @@ angular.module('syncthing.core')
}; };
$scope.otherDevices = function () { $scope.otherDevices = function () {
return $scope.devices.filter(function (n) { return $scope.deviceList().filter(function (n) {
return n.deviceID !== $scope.myID; return n.deviceID !== $scope.myID;
}); });
}; };
$scope.thisDevice = function () { $scope.thisDevice = function () {
return $scope.thisDeviceIn($scope.devices); return $scope.devices[$scope.myID];
}; };
$scope.thisDeviceIn = function (l) { $scope.thisDeviceIn = function (l) {
@ -1599,16 +1575,16 @@ angular.module('syncthing.core')
}; };
$scope.setAllDevicesPause = function (pause) { $scope.setAllDevicesPause = function (pause) {
$scope.devices.forEach(function (cfg) { for (var id in $scope.devices) {
cfg.paused = pause; $scope.devices[id].paused = pause;
}); };
$scope.config.devices = $scope.devices; $scope.config.devices = deviceList($scope.devices);
$scope.saveConfig(); $scope.saveConfig();
} }
$scope.isAtleastOneDevicePausedStateSetTo = function (pause) { $scope.isAtleastOneDevicePausedStateSetTo = function (pause) {
for (var i = 0; i < $scope.devices.length; i++) { for (var id in $scope.devices) {
if ($scope.devices[i].paused == pause) { if ($scope.devices[id].paused == pause) {
return true; return true;
} }
} }
@ -1641,9 +1617,8 @@ angular.module('syncthing.core')
}; };
$scope.friendlyDevices = function (str) { $scope.friendlyDevices = function (str) {
for (var i = 0; i < $scope.devices.length; i++) { for (var id in $scope.devices) {
var cfg = $scope.devices[i]; str = str.replace(id, $scope.deviceName($scope.devices[id]));
str = str.replace(cfg.deviceID, $scope.deviceName(cfg));
} }
return str; return str;
}; };
@ -1652,6 +1627,10 @@ angular.module('syncthing.core')
return folderList($scope.folders); return folderList($scope.folders);
}; };
$scope.deviceList = function () {
return deviceList($scope.devices);
};
$scope.directoryList = []; $scope.directoryList = [];
$scope.$watch('currentFolder.path', function (newvalue) { $scope.$watch('currentFolder.path', function (newvalue) {
@ -1724,18 +1703,15 @@ angular.module('syncthing.core')
$scope.currentFolder.path = $scope.currentFolder.path.slice(0, -1); $scope.currentFolder.path = $scope.currentFolder.path.slice(0, -1);
} }
// Cache complete device objects indexed by ID for lookups // Cache complete device objects indexed by ID for lookups
var devMap = deviceMap($scope.devices) initShareEditing('folder');
$scope.currentFolder.sharedDevices = [];
$scope.currentFolder.selectedDevices = {};
$scope.currentFolder.devices.forEach(function (n) { $scope.currentFolder.devices.forEach(function (n) {
if (n.deviceID !== $scope.myID) { if (n.deviceID !== $scope.myID) {
$scope.currentFolder.sharedDevices.push(devMap[n.deviceID]); $scope.currentSharing.shared.push($scope.devices[n.deviceID]);
} }
$scope.currentFolder.selectedDevices[n.deviceID] = true; $scope.currentSharing.selected[n.deviceID] = true;
}); });
$scope.currentFolder.unrelatedDevices = $scope.devices.filter(function (n) { $scope.currentSharing.unrelated = $scope.deviceList().filter(function (n) {
return n.deviceID !== $scope.myID return n.deviceID !== $scope.myID && !$scope.currentSharing.selected[n.deviceID]
&& !$scope.currentFolder.selectedDevices[n.deviceID]
}); });
if ($scope.currentFolder.versioning && $scope.currentFolder.versioning.type === "trashcan") { if ($scope.currentFolder.versioning && $scope.currentFolder.versioning.type === "trashcan") {
$scope.currentFolder.trashcanFileVersioning = true; $scope.currentFolder.trashcanFileVersioning = true;
@ -1795,16 +1771,16 @@ angular.module('syncthing.core')
}; };
$scope.selectAllSharedDevices = function (state) { $scope.selectAllSharedDevices = function (state) {
var devices = $scope.currentFolder.sharedDevices; var devices = $scope.currentSharing.shared;
for (var i = 0; i < devices.length; i++) { for (var i = 0; i < devices.length; i++) {
$scope.currentFolder.selectedDevices[devices[i].deviceID] = !!state; $scope.currentSharing.selected[devices[i].deviceID] = !!state;
} }
}; };
$scope.selectAllUnrelatedDevices = function (state) { $scope.selectAllUnrelatedDevices = function (state) {
var devices = $scope.currentFolder.unrelatedDevices; var devices = $scope.currentSharing.unrelated;
for (var i = 0; i < devices.length; i++) { for (var i = 0; i < devices.length; i++) {
$scope.currentFolder.selectedDevices[devices[i].deviceID] = !!state; $scope.currentSharing.selected[devices[i].deviceID] = !!state;
} }
}; };
@ -1812,8 +1788,9 @@ angular.module('syncthing.core')
$http.get(urlbase + '/svc/random/string?length=10').success(function (data) { $http.get(urlbase + '/svc/random/string?length=10').success(function (data) {
$scope.editingExisting = false; $scope.editingExisting = false;
$scope.currentFolder = angular.copy($scope.folderDefaults); $scope.currentFolder = angular.copy($scope.folderDefaults);
initShareEditing('folder');
$scope.currentFolder.id = (data.random.substr(0, 5) + '-' + data.random.substr(5, 5)).toLowerCase(); $scope.currentFolder.id = (data.random.substr(0, 5) + '-' + data.random.substr(5, 5)).toLowerCase();
$scope.currentFolder.unrelatedDevices = $scope.otherDevices(); $scope.currentSharing.unrelated = $scope.otherDevices();
$scope.ignores.text = ''; $scope.ignores.text = '';
$scope.ignores.error = null; $scope.ignores.error = null;
$scope.ignores.disabled = false; $scope.ignores.disabled = false;
@ -1829,8 +1806,11 @@ angular.module('syncthing.core')
$scope.currentFolder.viewFlags = { $scope.currentFolder.viewFlags = {
importFromOtherDevice: true importFromOtherDevice: true
}; };
$scope.currentFolder.selectedDevices[device] = true; initShareEditing('folder');
$scope.currentFolder.unrelatedDevices = $scope.otherDevices(); $scope.currentSharing.selected[device] = true;
$scope.currentSharing.unrelated = $scope.deviceList().filter(function (n) {
return n.deviceID !== $scope.myID && !$scope.currentSharing.selected[n.deviceID]
});
$scope.ignores.text = ''; $scope.ignores.text = '';
$scope.ignores.error = null; $scope.ignores.error = null;
$scope.ignores.disabled = false; $scope.ignores.disabled = false;
@ -1848,25 +1828,23 @@ angular.module('syncthing.core')
$scope.saveFolder = function () { $scope.saveFolder = function () {
$('#editFolder').modal('hide'); $('#editFolder').modal('hide');
var folderCfg = angular.copy($scope.currentFolder); var folderCfg = angular.copy($scope.currentFolder);
folderCfg.selectedDevices[$scope.myID] = true; $scope.currentSharing.selected[$scope.myID] = true;
var newDevices = []; var newDevices = [];
folderCfg.devices.forEach(function (dev) { folderCfg.devices.forEach(function (dev) {
if (folderCfg.selectedDevices[dev.deviceID] === true) { if ($scope.currentSharing.selected[dev.deviceID] === true) {
newDevices.push(dev); newDevices.push(dev);
delete folderCfg.selectedDevices[dev.deviceID]; delete $scope.currentSharing.selected[dev.deviceID];
}; };
}); });
for (var deviceID in folderCfg.selectedDevices) { for (var deviceID in $scope.currentSharing.selected) {
if (folderCfg.selectedDevices[deviceID] === true) { if ($scope.currentSharing.selected[deviceID] === true) {
newDevices.push({ newDevices.push({
deviceID: deviceID deviceID: deviceID
}); });
} }
} }
folderCfg.devices = newDevices; folderCfg.devices = newDevices;
delete folderCfg.sharedDevices; delete $scope.currentSharing;
delete folderCfg.selectedDevices;
delete folderCfg.unrelatedDevices;
if (folderCfg.fileVersioningSelector === "trashcan") { if (folderCfg.fileVersioningSelector === "trashcan") {
folderCfg.versioning = { folderCfg.versioning = {
@ -1948,12 +1926,9 @@ angular.module('syncthing.core')
// Bump time // Bump time
pendingFolder.time = (new Date()).toISOString(); pendingFolder.time = (new Date()).toISOString();
for (var i = 0; i < $scope.devices.length; i++) { if (id in $scope.devices) {
if ($scope.devices[i].deviceID == device) { $scope.devices[id].ignoredFolders.push(pendingFolder);
$scope.devices[i].ignoredFolders.push(pendingFolder);
$scope.saveConfig(); $scope.saveConfig();
return;
}
} }
}; };
@ -1961,7 +1936,7 @@ angular.module('syncthing.core')
var names = []; var names = [];
folderCfg.devices.forEach(function (device) { folderCfg.devices.forEach(function (device) {
if (device.deviceID !== $scope.myID) { if (device.deviceID !== $scope.myID) {
names.push($scope.deviceName($scope.findDevice(device.deviceID))); names.push($scope.deviceName($scope.devices[device.deviceID]));
} }
}); });
names.sort(); names.sort();
@ -2481,7 +2456,6 @@ angular.module('syncthing.core')
$scope.modalLoaded = function () { $scope.modalLoaded = function () {
// once all modal elements have been processed // once all modal elements have been processed
if ($('modal').length === 0) { if ($('modal').length === 0) {
// pseudo main. called on all definitions assigned // pseudo main. called on all definitions assigned
initController(); initController();
} }

5
gui/default/syncthing/core/validDeviceidDirective.js
View File

@ -16,10 +16,7 @@ angular.module('syncthing.core')
} }
}); });
//Prevents user from adding a duplicate ID //Prevents user from adding a duplicate ID
var matches = scope.devices.filter(function (n) { if ($scope.devices.hasOwnProperty(viewValue)) {
return n.deviceID == viewValue;
}).length;
if (matches > 0) {
ctrl.$setValidity('unique', false); ctrl.$setValidity('unique', false);
} else { } else {
ctrl.$setValidity('unique', true); ctrl.$setValidity('unique', true);

4
gui/default/syncthing/device/editDeviceModalView.html
View File

@ -76,10 +76,10 @@
<div class="col-md-4" ng-repeat="folder in folderList()"> <div class="col-md-4" ng-repeat="folder in folderList()">
<div class="checkbox"> <div class="checkbox">
<label ng-if="folder.label.length == 0"> <label ng-if="folder.label.length == 0">
<input type="checkbox" ng-model="currentDevice.selectedFolders[folder.id]">&nbsp;{{folder.id}} <input type="checkbox" ng-model="currentSharing.selected[folder.id]">&nbsp;{{folder.id}}
</label> </label>
<label ng-if="folder.label.length != 0"> <label ng-if="folder.label.length != 0">
<input type="checkbox" ng-model="currentDevice.selectedFolders[folder.id]">&nbsp; <span tooltip data-original-title="{{folder.id}}">{{folder.label}}</span> <input type="checkbox" ng-model="currentSharing.selected[folder.id]">&nbsp; <span tooltip data-original-title="{{folder.id}}">{{folder.label}}</span>
</label> </label>
</div> </div>
</div> </div>

12
gui/default/syncthing/folder/editFolderModalView.html
View File

@ -46,7 +46,7 @@
</div> </div>
<div id="folder-sharing" class="tab-pane"> <div id="folder-sharing" class="tab-pane">
<div class="form-group" ng-if="currentFolder.sharedDevices.length"> <div class="form-group" ng-if="currentSharing.shared.length">
<label translate>Currently Shared With Devices</label> <label translate>Currently Shared With Devices</label>
<p class="help-block"> <p class="help-block">
<span translate>Deselect devices to stop sharing this folder with.</span>&emsp; <span translate>Deselect devices to stop sharing this folder with.</span>&emsp;
@ -54,16 +54,16 @@
<a href="#" ng-click="selectAllSharedDevices(false)" translate>Deselect All</a></small> <a href="#" ng-click="selectAllSharedDevices(false)" translate>Deselect All</a></small>
</p> </p>
<div class="row"> <div class="row">
<div class="col-md-4" ng-repeat="device in currentFolder.sharedDevices"> <div class="col-md-4" ng-repeat="device in currentSharing.shared">
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" ng-model="currentFolder.selectedDevices[device.deviceID]" /> {{deviceName(device)}} <input type="checkbox" ng-model="currentSharing.selected[device.deviceID]" /> {{deviceName(device)}}
</label> </label>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group" ng-if="currentFolder.unrelatedDevices.length || otherDevices().length <= 0"> <div class="form-group" ng-if="currentSharing.unrelated.length || otherDevices().length <= 0">
<label translate>Unshared Devices</label> <label translate>Unshared Devices</label>
<p class="help-block" ng-if="otherDevices().length > 0"> <p class="help-block" ng-if="otherDevices().length > 0">
<span translate>Select additional devices to share this folder with.</span>&emsp; <span translate>Select additional devices to share this folder with.</span>&emsp;
@ -74,10 +74,10 @@
<span translate>There are no devices to share this folder with.</span> <span translate>There are no devices to share this folder with.</span>
</p> </p>
<div class="row"> <div class="row">
<div class="col-md-4" ng-repeat="device in currentFolder.unrelatedDevices"> <div class="col-md-4" ng-repeat="device in currentSharing.unrelated">
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" ng-model="currentFolder.selectedDevices[device.deviceID]" /> {{deviceName(device)}} <input type="checkbox" ng-model="currentSharing.selected[device.deviceID]" /> {{deviceName(device)}}
</label> </label>
</div> </div>
</div> </div>