fix(bulk): pr feedback

ovh-ux · Jan 3, 2018 · a906a54 · a906a54
1 parent bc8389c
commit a906a54
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/...s/configuration/changeType/telecom-telephony-alias-configuration-changeType.controller.js b/...s/configuration/changeType/telecom-telephony-alias-configuration-changeType.controller.js
@@ -85,8 +85,6 @@ angular.module("managerApp").controller("TelecomTelephonyAliasConfigurationChang
     ============================ */
 
     self.bulkDatas = {
-        billingAccount: $stateParams.billingAccount,
-        serviceName: $stateParams.serviceName,
         infos: {
             name: "configurationNumberChangeType",
             actions: [{
@@ -142,7 +140,15 @@ angular.module("managerApp").controller("TelecomTelephonyAliasConfigurationChang
         Toast.error([$translate.instant("telephony_alias_config_change_type_bulk_on_error"), _.get(error, "msg.data")].join(" "));
     };
 
+
     self.checkServerTasksStatus = function (updatedServices) {
+
+        function runPollOnTask (billingAccount, serviceName, taskId) {
+            return function () {
+                return voipServiceTask.startPolling(billingAccount, serviceName, taskId);
+            };
+        }
+
         self.loading.changing = true;
 
         var chain = $q.when();
@@ -163,12 +169,6 @@ angular.module("managerApp").controller("TelecomTelephonyAliasConfigurationChang
         return chain;
     };
 
-    function runPollOnTask (billingAccount, serviceName, taskId) {
-        return function () {
-            return voipServiceTask.startPolling(billingAccount, serviceName, taskId);
-        };
-    }
-
     /* -----  End of BULK  ------ */
 
     init();

diff --git a/...hony/alias/configuration/changeType/telecom-telephony-alias-configuration-changeType.html b/...hony/alias/configuration/changeType/telecom-telephony-alias-configuration-changeType.html
@@ -63,8 +63,8 @@ <h1 data-translate="telephony_alias_change_type_title"></h1>
                     </div>
 
                     <telephony-bulk-action data-service-type="alias"
-                                           data-billing-account="{{ AliasConfigurationChangeTypeCtrl.bulkDatas.billingAccount }}"
-                                           data-service-name="{{ AliasConfigurationChangeTypeCtrl.bulkDatas.serviceName }}"
+                                           data-billing-account="{{ AliasConfigurationChangeTypeCtrl.number.billingAccount }}"
+                                           data-service-name="{{ AliasConfigurationChangeTypeCtrl.number.serviceName }}"
                                            data-custom-class="link d-block pl-0 mb-3"
                                            data-bulk-infos="AliasConfigurationChangeTypeCtrl.bulkDatas.infos"
                                            data-ng-disabled="!changeTypeForm.$valid"

diff --git a/client/components/telecom/telephony/group/telephony-group.factory.js b/client/components/telecom/telephony/group/telephony-group.factory.js
@@ -162,7 +162,7 @@ angular.module("managerApp").factory("TelephonyGroup", function ($q, OvhApiTelep
         var self = this;
         var number;
 
-        // TODO : handle when group is form other service than alias
+        // TODO : handle when service is not an alias
         return OvhApiTelephony.Number().Lexi().get({
             billingAccount: self.billingAccount,
             serviceName: serviceName
@@ -171,8 +171,10 @@ angular.module("managerApp").factory("TelephonyGroup", function ($q, OvhApiTelep
                 billingAccount: self.billingAccount
             }));
 
-            if (self.numbers.indexOf(number)) {
-                self.numbers.splice(self.numbers.indexOf(number), 1, number);
+            if (self.getNumber(number.serviceName)) {
+                self.numbers.splice(_.findIndex(self.numbers, function (n) {
+                    return n.serviceName === number.serviceName;
+                }), 1, number);
             } else {
                 self.addNumber(number);
             }