فهرست منبع

Fix checkbox bug in updater

DSR! 3 سال پیش
والد
کامیت
c4252b0bbd
2فایلهای تغییر یافته به همراه8 افزوده شده و 6 حذف شده
  1. 5 3
      src/pineapple/modules/Advanced/js/module.js
  2. 3 3
      src/pineapple/modules/Advanced/module.html

+ 5 - 3
src/pineapple/modules/Advanced/js/module.js

@@ -166,6 +166,7 @@ registerController("AdvancedUpgradeController", ['$api', '$scope', '$interval',
     $scope.manualUpgradeUrl = "";
     $scope.showManualUpgradeError = false;
     $scope.keepSettings = true;
+    $scope.manualKeepSettings = true;
 
     $scope.reloadData = (function() {
         $api.request({
@@ -258,7 +259,7 @@ registerController("AdvancedUpgradeController", ['$api', '$scope', '$interval',
                 if (isManuelUpdate) {
                     $scope.upgradeData = response;
                 } else {
-                    $scope.performUpgrade(true);
+                    $scope.performUpgrade(isManuelUpdate);
                 }
             } else if (response.error) {
                 $scope.error = response.error;
@@ -268,11 +269,12 @@ registerController("AdvancedUpgradeController", ['$api', '$scope', '$interval',
         });
     });
 
-    $scope.performUpgrade = (function() {
+    $scope.performUpgrade = (function(isManuelUpdate) {
+        console.log({isManuelUpdate});
         $api.request({
             module: 'Advanced',
             action: 'performUpgrade',
-            keepSettings: $scope.keepSettings
+            keepSettings: isManuelUpdate ? $('#manualKeepSettings').is(':checked') : $('#keepSettings').is(':checked'),
         }, function(response) {
             if (response.success === true) {
                 $scope.performUpgradeStart = true;

+ 3 - 3
src/pineapple/modules/Advanced/module.html

@@ -186,7 +186,7 @@
                             </p>
                             <div class="input-group" ng-if="upgradeData['upgradeUrl']">
                                 <div class="checkbox">
-                                    <label><input type="checkbox" ng-model="keepSettings">Keep settings and retain the current configuration</label>
+                                    <label><input type="checkbox" id="keepSettings" ng-model="keepSettings">Keep settings and retain the current configuration</label>
                                 </div>
                                 <br/>
                                 <button class="btn btn-default" ng-click="downloadUpgrade()">Perform Upgrade</button>
@@ -240,10 +240,10 @@
                             </p>
                             <div class="input-group">
                                 <div class="checkbox">
-                                    <label><input type="checkbox" ng-model="keepSettings">Keep settings and retain the current configuration</label>
+                                    <label><input type="checkbox" id="manualKeepSettings" ng-model="manualKeepSettings">Keep settings and retain the current configuration</label>
                                 </div>
                                 <br/>
-                                <button class="btn btn-default" ng-click="performUpgrade()" ng-disabled="performUpgradeStart">
+                                <button class="btn btn-default" ng-click="performUpgrade(true)" ng-disabled="performUpgradeStart">
                                     <span ng-hide="performUpgradeStart">Install</span>
                                     <img class="image-small-18" src="img/throbber.gif" ng-show="performUpgradeStart">
                                 </button>