Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gui: Fix editing devices (fixes #3236) 

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3237
This commit is contained in:
Audrius Butkevicius 2016-06-01 20:24:43 +00:00 committed by Jakob Borg
parent 01ae866d58
commit 8c4723ff43
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/default/index.html
View File

@ -539,7 +539,7 @@
</tr>
<tr ng-if="deviceFolders(deviceCfg).length > 0">
<th><span class="fa fa-fw fa-folder"></span>&nbsp;<span translate>Folders</span></th>
<td class="text-right">{{deviceFolders(deviceCfg).join(", ")}}</td>
<td class="text-right">{{deviceFolders(deviceCfg).map(folderLabel).join(", ")}}</td>
</tr>
</tbody>
</table>

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

@ -784,7 +784,7 @@ angular.module('syncthing.core')
var syncCount = 0;
var notifyCount = 0;
var pauseCount = 0;
// loop through all folders
var folderListCache = $scope.folderList();
for (var i = 0; i < folderListCache.length; i++) {
@ -835,12 +835,12 @@ angular.module('syncthing.core')
if (notifyCount > 0) {
return 'notify';
}
// all used devices are paused except (this) one
if (pauseCount === deviceCount-1) {
return 'pause';
}
return 'default';
};
@ -1406,8 +1406,7 @@ angular.module('syncthing.core')
var devices = $scope.folders[folderID].devices;
for (var i = 0; i < devices.length; i++) {
if (devices[i].deviceID === deviceCfg.deviceID) {
var label = $scope.folders[folderID].label;
folders.push(label.length > 0 ? label : folderID);
folders.push(folderID);
break;
}
}
@ -1417,6 +1416,11 @@ angular.module('syncthing.core')
return folders;
};
$scope.folderLabel = function (folderID) {
var label = $scope.folders[folderID].label;
return label.length > 0 ? label : folderID;
}
$scope.deleteFolder = function (id) {
$('#editFolder').modal('hide');
if (!$scope.editingExisting) {