Эх сурвалжийг харах

Panel - Networking: Change NetworkingAdvancedController logic

DSR! 4 жил өмнө
parent
commit
a64c5fcec5

+ 7 - 3
src/pineapple/modules/Networking/js/module.js

@@ -330,6 +330,8 @@ registerController('NetworkingAdvancedController', ['$api', '$scope', '$timeout'
     };
 
     $scope.reloadData = (function() {
+        $scope.data['ifconfig'] = 'Loading...';
+        $scope.data['wireless'] = 'Loading...';
         $api.request({
             module: 'Networking',
             action: 'getAdvancedData'
@@ -350,7 +352,7 @@ registerController('NetworkingAdvancedController', ['$api', '$scope', '$timeout'
                 $scope.hostnameUpdated = true;
                 $timeout(function(){
                     $scope.hostnameUpdated = false;
-                }, 2000);
+                }, 3000);
             }
         });
     });
@@ -363,8 +365,9 @@ registerController('NetworkingAdvancedController', ['$api', '$scope', '$timeout'
             if (response.error === undefined) {
                 $scope.wirelessReset = true;
                 $timeout(function(){
+                    $scope.reloadData();
                     $scope.wirelessReset = false;
-                }, 5000);
+                }, 3000);
             }
         });
     });
@@ -378,8 +381,9 @@ registerController('NetworkingAdvancedController', ['$api', '$scope', '$timeout'
             if (response.success === true) {
                 $scope.wirelessUpdated = true;
                 $timeout(function(){
+                    $scope.reloadData();
                     $scope.wirelessUpdated = false;
-                }, 5000);
+                }, 3000);
             }
         });
     });

+ 3 - 1
src/pineapple/modules/Networking/module.html

@@ -346,6 +346,9 @@
                 </h3>
             </div>
             <div class="panel-body">
+                <div class="alert well-sm alert-success" ng-show="wirelessReset">
+                    The Wireless Configuration has been reset. The Network will now restart.
+                </div>
                 <p>
                     <textarea class="form-control" rows="12" ng-model="data['wireless']"></textarea>
                 </p>
@@ -361,7 +364,6 @@
                 <h3 class="panel-title">Advanced</h3>
             </div>
             <div class="panel-body">
-                <div class="alert well-sm alert-success" ng-show="wirelessReset">The Wireless Configuration has been reset. The Network will now restart.</div>
                 <div class="alert well-sm alert-success" ng-show="hostnameUpdated">The hostname has been updated successfully.</div>
                 <div class="col-md-12">
                     <div class="row">