diff --git a/luciexpress/Gruntfile.js b/luciexpress/Gruntfile.js index 2534fea00..121db88a2 100644 --- a/luciexpress/Gruntfile.js +++ b/luciexpress/Gruntfile.js @@ -112,7 +112,7 @@ module.exports = function(grunt){ "htdocs/lib/js/angular-ui-bootstrap-luci.min.js", "htdocs/lib/js/jquery-jsonrpc.js", "htdocs/lib/js/translations.js", - //"htdocs/lib/js/bootstrap.min.js", + "htdocs/lib/js/bootstrap.min.js", "htdocs/lib/js/angular-ui-switch.min.js", "htdocs/lib/js/angular-modal-service.min.js", "htdocs/lib/js/angular-checklist-model.js" diff --git a/luciexpress/htdocs/plugins/settings/pages/settings.upgrade.js b/luciexpress/htdocs/plugins/settings/pages/settings.upgrade.js index e66da7b10..2131bf4ad 100644 --- a/luciexpress/htdocs/plugins/settings/pages/settings.upgrade.js +++ b/luciexpress/htdocs/plugins/settings/pages/settings.upgrade.js @@ -111,7 +111,7 @@ JUCI.app .controller("SettingsUpgradeCtrl", function($scope, $config, $uci, $rpc, gettext){ $scope.sessionID = $rpc.$sid(); - $scope.uploadFilename = "/tmp/firmware.bin"; + $scope.uploadFilename = "/tmp/uploads/firmware.bin"; $scope.usbFileName = "()"; $scope.config = $config; @@ -153,12 +153,12 @@ JUCI.app }); } - $uci.sync("system").done(function(){ + /*$uci.sync("system").done(function(){ if($uci.system.upgrade && $uci.system.upgrade.fw_upload_path.value){ $scope.uploadFilename = $uci.system.upgrade.fw_upload_path.value; console.log("Using upload path from config: "+$scope.uploadFilename); } - }); + });*/ $scope.onCheckOnline = function(){ $rpc.luci2.system.upgrade_check({type: "online"}).done(function(response){