mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated uploads

Browse source
This commit is contained in:
Martin Schröder 2015-05-25 16:34:30 +02:00 • committed by Martin Schröder
parent 1105e6080e
commit c4d88309b5
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
luciexpress/Gruntfile.js
View file

@ -112,7 +112,7 @@ module.exports = function(grunt){
"htdocs/lib/js/angular-ui-bootstrap-luci.min.js", "htdocs/lib/js/angular-ui-bootstrap-luci.min.js",
"htdocs/lib/js/jquery-jsonrpc.js", "htdocs/lib/js/jquery-jsonrpc.js",
"htdocs/lib/js/translations.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-ui-switch.min.js",
"htdocs/lib/js/angular-modal-service.min.js", "htdocs/lib/js/angular-modal-service.min.js",
"htdocs/lib/js/angular-checklist-model.js" "htdocs/lib/js/angular-checklist-model.js"

6
luciexpress/htdocs/plugins/settings/pages/settings.upgrade.js
View file

@ -111,7 +111,7 @@
JUCI.app JUCI.app
.controller("SettingsUpgradeCtrl", function($scope, $config, $uci, $rpc, gettext){ .controller("SettingsUpgradeCtrl", function($scope, $config, $uci, $rpc, gettext){
$scope.sessionID = $rpc.$sid(); $scope.sessionID = $rpc.$sid();
$scope.uploadFilename = "/tmp/firmware.bin"; $scope.uploadFilename = "/tmp/uploads/firmware.bin";
$scope.usbFileName = "()"; $scope.usbFileName = "()";
$scope.config = $config; $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){ if($uci.system.upgrade && $uci.system.upgrade.fw_upload_path.value){
$scope.uploadFilename = $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); console.log("Using upload path from config: "+$scope.uploadFilename);
} }
}); });*/
$scope.onCheckOnline = function(){ $scope.onCheckOnline = function(){
$rpc.luci2.system.upgrade_check({type: "online"}).done(function(response){ $rpc.luci2.system.upgrade_check({type: "online"}).done(function(response){