step 1. removed POST settings/language

nethesis · Nov 21, 2023 · a8863d0 · a8863d0
1 parent c80719a
commit a8863d0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 61 deletions.
diff --git a/wizard/app/scripts/controllers/admin/languages.js b/wizard/app/scripts/controllers/admin/languages.js
@@ -51,58 +51,18 @@ angular.module('nethvoiceWizardUiApp')
       $scope.onSaveSuccess = false;
       $scope.onSaveError = false;
       $scope.wizard.nextState = true;
-      ConfigService.setPBXLang({
+
+      // set default language
+      ConfigService.setDefaultPBXLang({
         lang: lang
       }).then(function (res) {
-        $scope.taskPromise = $interval(function () {
-          UtilService.taskStatus(res.data.result).then(function (res) {
-            if (res.data.progress < 100) {
-              $scope.errorCount = 0;
-              $scope.currentProgress = res.data.progress;
-            } else if (res.data.progress == 100) {
-              $scope.errorCount = 0;
-              $interval.cancel($scope.taskPromise);
-              $scope.currentProgress = 100;
-              // set default language
-              ConfigService.setDefaultPBXLang({
-                lang: lang
-              }).then(function (res) {
-                $scope.currentLanguage = $scope.language;
-                $scope.onSaveSuccess = true;
-                $scope.onSaveError = false;
-              }, function (err) {
-                console.error(err);
-                $scope.onSaveSuccess = false;
-                $scope.onSaveError = true;
-              });
-            } else {
-              console.log(res.error);
-              if ($scope.errorCount < appConfig.MAX_TRIES) {
-                $scope.errorCount++;
-              } else {
-                $interval.cancel($scope.taskPromise);
-                $scope.currentProgress = -1;
-                $scope.onSaveSuccess = false;
-                $scope.onSaveError = true;
-              }
-            }
-          }, function (err) {
-            console.log(err);
-            if ($scope.errorCount < appConfig.MAX_TRIES) {
-              $scope.errorCount++;
-            } else {
-              $interval.cancel($scope.taskPromise);
-              $scope.currentProgress = -1;
-              $scope.onSaveSuccess = false;
-              $scope.onSaveError = true;
-            }
-          });
-        }, 5000);
+        $scope.currentLanguage = $scope.language;
+        $scope.onSaveSuccess = true;
+        $scope.onSaveError = false;
       }, function (err) {
         console.error(err);
         $scope.onSaveSuccess = false;
         $scope.onSaveError = true;
-        $scope.currentProgress = 100;
       });
     };
 

diff --git a/wizard/app/views/admin/languages.html b/wizard/app/views/admin/languages.html
@@ -41,21 +41,6 @@ <h3>{{'Set system language' | translate}} <span ng-if="language" class="slim-wei
           </div>
         </div>
       </form>
-      <div ng-show="startInstallation">
-        <div class="progress-description">
-          <div ng-if="currentProgress < 100 && currentProgress != -1" class="spinner spinner-xs spinner-inline"></div>
-          <span ng-if="currentProgress == 100" class="pficon pficon-ok"></span>
-          <span ng-if="currentProgress == -1" class="pficon pficon-error-circle-o"></span>
-          <span ng-if="currentProgress != -1"><strong>{{'Installing' | translate}}:</strong> {{'system languages' | translate}}</span>
-          <span ng-if="currentProgress == -1"><strong>{{'Error' | translate}}:</strong> {{'installation failed' | translate}}</span>
-        </div>
-        <div class="progress progress-label-top-right">
-          <div class="progress-bar {{currentProgress == -1 ? 'progress-bar-danger' : 'progress-bar-success'}}" role="progressbar" aria-valuenow="0"
-            aria-valuemin="0" aria-valuemax="100" style="width: {{currentProgress == -1 ? '100' : currentProgress}}%;">
-            <span>{{currentProgress == -1 ? '100' : currentProgress}}%</span>
-          </div>
-        </div>
-      </div>
     </div>
   </div>
   <wizard-step ng-if="wizard.isWizard" id="wizardStepBase"></wizard-step>