fix: #269

usmannasir · Feb 26, 2020 · 3f52c9f · 3f52c9f
1 parent 8ca2778
commit 3f52c9f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/mailServer/static/mailServer/mailServer.js b/mailServer/static/mailServer/mailServer.js
@@ -886,6 +886,11 @@ app.controller('emailForwarding', function ($scope, $http) {
 
     $scope.fetchCurrentForwardings = function () {
 
+        if($scope.forwardingOption == null || $scope.selectedEmail == null ){
+            $scope.forwardLoading = true;
+            return 0;
+        }
+
         $scope.creationBox = false;
         $scope.emailDetails = false;
         $scope.forwardLoading = false;

diff --git a/mailServer/templates/mailServer/emailForwarding.html b/mailServer/templates/mailServer/emailForwarding.html
@@ -51,7 +51,7 @@ <h3>{% trans "Postfix is disabled." %}
                 <div ng-hide="emailDetails" class="form-group">
                     <label class="col-sm-3 control-label">{% trans "Select Email" %} </label>
                     <div class="col-sm-6">
-                        <select ng-model="selectedEmail" class="form-control">
+                        <select ng-change="selectForwardingEmail()" ng-model="selectedEmail" class="form-control">
                                 <option ng-repeat="email in emails track by $index">{$ email.email $}</option>
                         </select>
                     </div>

diff --git a/static/mailServer/mailServer.js b/static/mailServer/mailServer.js
@@ -886,6 +886,11 @@ app.controller('emailForwarding', function ($scope, $http) {
 
     $scope.fetchCurrentForwardings = function () {
 
+        if($scope.forwardingOption == null || $scope.selectedEmail == null ){
+            $scope.forwardLoading = true;
+            return 0;
+        }
+
         $scope.creationBox = false;
         $scope.emailDetails = false;
         $scope.forwardLoading = false;