perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clarify repo mismatch message (fixes #331)

Browse Source
This commit is contained in:
Jakob Borg
2014-06-04 14:17:48 +02:00
parent bec5c76631
commit afc2d6fda4
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
auto/gui.files.go
View File

File diff suppressed because one or more lines are too long

2
gui/index.html
View File

@@ -516,7 +516,7 @@ found in the LICENSE file.
<p class="help-block">File permission bits are ignored when looking for changes. Use on FAT filesystems.</p> <p class="help-block">File permission bits are ignored when looking for changes. Use on FAT filesystems.</p>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="nodes">Nodes</label> <label for="nodes">Share With</label>
<div class="checkbox" ng-repeat="node in otherNodes()"> <div class="checkbox" ng-repeat="node in otherNodes()">
<label> <label>
<input type="checkbox" ng-model="currentRepo.selectedNodes[node.NodeID]"> {{nodeName(node)}} <input type="checkbox" ng-model="currentRepo.selectedNodes[node.NodeID]"> {{nodeName(node)}}

3
model/model.go
View File

@@ -279,8 +279,7 @@ func (m *Model) Index(nodeID string, repo string, fs []protocol.FileInfo) {
if r, ok := m.repoFiles[repo]; ok { if r, ok := m.repoFiles[repo]; ok {
r.Replace(id, files) r.Replace(id, files)
} else { } else {
l.Warnf("Index from %s for unexpected repo %q; verify configuration", nodeID, repo) l.Warnf("Unexpected repository ID %q sent from node %q; ensure that the repository exists and that this node is selected under \"Share With\" in the repository configuration.", repo, nodeID)
} }
m.rmut.RUnlock() m.rmut.RUnlock()
} }