Hard override on changes from master repo

This commit is contained in:
Jakob Borg
2014-06-16 10:47:02 +02:00
parent 12eda0449a
commit 26ebbee877
5 changed files with 42 additions and 3 deletions

View File

@@ -627,6 +627,12 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
}
};
$scope.override = function (repo) {
$http.post(urlbase + "/model/override?repo=" + encodeURIComponent(repo)).success(function () {
$scope.refresh();
});
};
$scope.init();
setInterval($scope.refresh, 10000);
});

View File

@@ -206,7 +206,10 @@ found in the LICENSE file.
</tbody>
</table>
</div>
<span class="pull-right"><a class="btn btn-sm btn-primary" href="" ng-click="editRepo(repo)"><span class="glyphicon glyphicon-pencil"></span>&emsp;Edit</a></span>
<span class="pull-right">
<a class="btn btn-sm btn-primary" href="" ng-click="editRepo(repo)"><span class="glyphicon glyphicon-pencil"></span>&emsp;Edit</a>
<a class="btn btn-sm btn-danger" ng-if="repo.ReadOnly && model[repo.ID].needFiles > 0" ng-click="override(repo.ID)" href=""><span class="glyphicon glyphicon-upload"></span>&emsp;Override Changes</a>
</span>
</div>
</div>
</div>