gui: Add arrays for pending/ignored folders (fixes #5190) (#5192)

This commit is contained in:
Audrius Butkevicius 2018-09-13 21:52:16 +01:00 committed by Simon Frei
parent a57fa9cfab
commit 710dba7f84
2 changed files with 23 additions and 1 deletions

View File

@ -1388,7 +1388,9 @@ angular.module('syncthing.core')
_addressesStr: 'dynamic',
compression: 'metadata',
introducer: false,
selectedFolders: {}
selectedFolders: {},
pendingFolders: [],
ignoredFolders: []
};
$scope.editingExisting = false;
$scope.deviceEditor.$setPristine();

View File

@ -1073,6 +1073,26 @@ func TestFilterURLSchemePrefix(t *testing.T) {
}
}
func TestDeviceConfigObservedNotNil(t *testing.T) {
cfg := Configuration{
Devices: []DeviceConfiguration{
{},
},
}
cfg.prepare(device1)
for _, dev := range cfg.Devices {
if dev.IgnoredFolders == nil {
t.Errorf("Ignored folders nil")
}
if dev.PendingFolders == nil {
t.Errorf("Pending folders nil")
}
}
}
// defaultConfigAsMap returns a valid default config as a JSON-decoded
// map[string]interface{}. This is useful to override random elements and
// re-encode into JSON.