Archived
Merge remote-tracking branch 'origin/pr/647'
* origin/pr/647: Listen for ConfigSaved event in the UI (fixes #244) Emit ConfigSaved event Save config after updating node name
This commit is contained in:
commit
ac384e8a9c
5 files changed
+43
-26
No files matched your search
+1
-1
@@ -27,7 +27,7 @@ func Assets() map[string][]byte {
|
||||
bs, _ = ioutil.ReadAll(gr)
|
||||
assets["angular/angular.min.js"] = bs
|
||||
|
||||
bs, _ = base64.StdEncoding.DecodeString("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 truncated
|
||||
bs, _ = base64.StdEncoding.DecodeString("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 truncated
|
||||
gr, _ = gzip.NewReader(bytes.NewBuffer(bs))
|
||||
bs, _ = ioutil.ReadAll(gr)
|
||||
assets["app.js"] = bs
|
||||
|
||||
@@ -14,6 +14,7 @@ import (
|
||||
"strconv"
|
||||
|
||||
"code.google.com/p/go.crypto/bcrypt"
|
||||
"github.com/syncthing/syncthing/events"
|
||||
"github.com/syncthing/syncthing/logger"
|
||||
"github.com/syncthing/syncthing/osutil"
|
||||
"github.com/syncthing/syncthing/protocol"
|
||||
@@ -260,6 +261,7 @@ func (cfg *Configuration) Save() error {
|
||||
if err != nil {
|
||||
l.Warnln("Saving config:", err)
|
||||
}
|
||||
events.Default.Log(events.ConfigSaved, cfg)
|
||||
return err
|
||||
}
|
||||
|
||||
|
||||
@@ -26,6 +26,7 @@ const (
|
||||
ItemStarted
|
||||
StateChanged
|
||||
RepoRejected
|
||||
ConfigSaved
|
||||
|
||||
AllEvents = ^EventType(0)
|
||||
)
|
||||
@@ -56,6 +57,8 @@ func (t EventType) String() string {
|
||||
return "StateChanged"
|
||||
case RepoRejected:
|
||||
return "RepoRejected"
|
||||
case ConfigSaved:
|
||||
return "ConfigSaved"
|
||||
default:
|
||||
return "Unknown"
|
||||
}
|
||||
|
||||
+36
-25
@@ -237,6 +237,14 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
|
||||
}
|
||||
})
|
||||
|
||||
$scope.$on('ConfigSaved', function (event, arg) {
|
||||
updateLocalConfig(arg.data);
|
||||
|
||||
$http.get(urlbase + '/config/sync').success(function (data) {
|
||||
$scope.configInSync = data.configInSync;
|
||||
});
|
||||
});
|
||||
|
||||
var debouncedFuncs = {};
|
||||
|
||||
function refreshRepo(repo) {
|
||||
@@ -252,6 +260,33 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
|
||||
debouncedFuncs[key]();
|
||||
}
|
||||
|
||||
function updateLocalConfig(config) {
|
||||
var hasConfig = !isEmptyObject($scope.config);
|
||||
|
||||
$scope.config = config;
|
||||
$scope.config.Options.ListenStr = $scope.config.Options.ListenAddress.join(', ');
|
||||
|
||||
$scope.nodes = $scope.config.Nodes;
|
||||
$scope.nodes.forEach(function (nodeCfg) {
|
||||
$scope.completion[nodeCfg.NodeID] = {
|
||||
_total: 100,
|
||||
};
|
||||
});
|
||||
$scope.nodes.sort(nodeCompare);
|
||||
|
||||
$scope.repos = repoMap($scope.config.Repositories);
|
||||
Object.keys($scope.repos).forEach(function (repo) {
|
||||
refreshRepo(repo);
|
||||
$scope.repos[repo].Nodes.forEach(function (nodeCfg) {
|
||||
refreshCompletion(nodeCfg.NodeID, repo);
|
||||
});
|
||||
});
|
||||
|
||||
if (!hasConfig) {
|
||||
$scope.$emit('ConfigLoaded');
|
||||
}
|
||||
}
|
||||
|
||||
function refreshSystem() {
|
||||
$http.get(urlbase + '/system').success(function (data) {
|
||||
$scope.myID = data.myID;
|
||||
@@ -324,31 +359,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
|
||||
|
||||
function refreshConfig() {
|
||||
$http.get(urlbase + '/config').success(function (data) {
|
||||
var hasConfig = !isEmptyObject($scope.config);
|
||||
|
||||
$scope.config = data;
|
||||
$scope.config.Options.ListenStr = $scope.config.Options.ListenAddress.join(', ');
|
||||
|
||||
$scope.nodes = $scope.config.Nodes;
|
||||
$scope.nodes.forEach(function (nodeCfg) {
|
||||
$scope.completion[nodeCfg.NodeID] = {
|
||||
_total: 100,
|
||||
};
|
||||
});
|
||||
$scope.nodes.sort(nodeCompare);
|
||||
|
||||
$scope.repos = repoMap($scope.config.Repositories);
|
||||
Object.keys($scope.repos).forEach(function (repo) {
|
||||
refreshRepo(repo);
|
||||
$scope.repos[repo].Nodes.forEach(function (nodeCfg) {
|
||||
refreshCompletion(nodeCfg.NodeID, repo);
|
||||
});
|
||||
});
|
||||
|
||||
if (!hasConfig) {
|
||||
$scope.$emit('ConfigLoaded');
|
||||
}
|
||||
|
||||
updateLocalConfig(data);
|
||||
console.log("refreshConfig", data);
|
||||
});
|
||||
|
||||
|
||||
@@ -451,6 +451,7 @@ func (m *Model) ClusterConfig(nodeID protocol.NodeID, config protocol.ClusterCon
|
||||
node := m.cfg.GetNodeConfiguration(nodeID)
|
||||
if node != nil && node.Name == "" {
|
||||
node.Name = name
|
||||
m.cfg.Save()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user