From d42c09eca84131ef2f3e5ab52bf9c52f543d6165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20DE=20CESARE?= Date: Thu, 14 Dec 2017 14:50:20 +0100 Subject: [PATCH] feat(bulk): added address validated before bulk action --- ...elecom-telephony-line-management-restrictions.controller.js | 1 - .../telecom-telephony-line-management-restrictions.html | 1 + .../bulkAction/telephony-bulk-action.component.controller.js | 3 +++ .../telephony/bulkAction/telephony-bulk-action.component.js | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/client/app/telecom/telephony/line/management/restrictions/telecom-telephony-line-management-restrictions.controller.js b/client/app/telecom/telephony/line/management/restrictions/telecom-telephony-line-management-restrictions.controller.js index 23dcb15d3..f176f03d6 100644 --- a/client/app/telecom/telephony/line/management/restrictions/telecom-telephony-line-management-restrictions.controller.js +++ b/client/app/telecom/telephony/line/management/restrictions/telecom-telephony-line-management-restrictions.controller.js @@ -206,7 +206,6 @@ angular.module("managerApp").controller("TelecomTelephonyLineRestrictionsCtrl", }); }); - self.applyLineChanges(); // reset initial values to be able to modify again the options OvhApiTelephony.Line().Lexi().resetAllCache(); init(); diff --git a/client/app/telecom/telephony/line/management/restrictions/telecom-telephony-line-management-restrictions.html b/client/app/telecom/telephony/line/management/restrictions/telecom-telephony-line-management-restrictions.html index c621375a1..91904fd8b 100644 --- a/client/app/telecom/telephony/line/management/restrictions/telecom-telephony-line-management-restrictions.html +++ b/client/app/telecom/telephony/line/management/restrictions/telecom-telephony-line-management-restrictions.html @@ -78,6 +78,7 @@

data-bulk-infos="LineRestrictionsCtrl.bulkDatas.infos" data-filter-services="LineRestrictionsCtrl.filterServices" data-get-bulk-params="LineRestrictionsCtrl.getBulkParams" + data-on-open="LineRestrictionsCtrl.applyLineChanges" data-on-success="LineRestrictionsCtrl.onBulkSuccess" data-on-error="LineRestrictionsCtrl.onBulkError"> diff --git a/client/components/telecom/telephony/bulkAction/telephony-bulk-action.component.controller.js b/client/components/telecom/telephony/bulkAction/telephony-bulk-action.component.controller.js index c78042899..e6de2cfa4 100644 --- a/client/components/telecom/telephony/bulkAction/telephony-bulk-action.component.controller.js +++ b/client/components/telecom/telephony/bulkAction/telephony-bulk-action.component.controller.js @@ -12,6 +12,9 @@ angular.module("managerApp").controller("telephonyBulkActionCtrl", function ($q, ============================== */ self.onBulkActionBtnClick = function () { + if (self.onOpen && _.isFunction(self.onOpen())) { + self.onOpen()(); + } return $uibModal.open({ templateUrl: "components/telecom/telephony/bulkAction/modal/telephony-bulk-action-modal.html", controller: "telephonyBulkActionModalCtrl", diff --git a/client/components/telecom/telephony/bulkAction/telephony-bulk-action.component.js b/client/components/telecom/telephony/bulkAction/telephony-bulk-action.component.js index 2034b58db..28f73eb8f 100644 --- a/client/components/telecom/telephony/bulkAction/telephony-bulk-action.component.js +++ b/client/components/telecom/telephony/bulkAction/telephony-bulk-action.component.js @@ -10,6 +10,7 @@ ngDisabled: "=?", bulkInfos: "<", getBulkParams: "&", + onOpen: "&?", onSuccess: "&?", onError: "&?", filterServices: "&?"