From b43425ea0ccf5b1cba26843165e0c57db5c83e15 Mon Sep 17 00:00:00 2001 From: Jean-Roch Maitre Date: Thu, 28 May 2015 10:18:04 -0700 Subject: [PATCH 1/2] UI-1588: Fixed an issue with the next extension finder mechanism --- submodules/users/users.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/users/users.js b/submodules/users/users.js index 2c8a551..cb94b9d 100644 --- a/submodules/users/users.js +++ b/submodules/users/users.js @@ -1404,7 +1404,7 @@ define(function(require){ if(typeof previousIterationNumber !== 'undefined') { // If there's a gap for a number between the last number and the current number, we check if it's a valid possible number (ie, greater than minNumber) // And If yes, we return it, if not we just continue - if(currentNumber - previousIterationNumber !== increment && previousIterationNumber > minNumber) { + if(currentNumber - previousIterationNumber !== increment && previousIterationNumber >= minNumber) { return previousIterationNumber + increment; } } From 49f512ae90e2223664589e8075c4792f430bd784 Mon Sep 17 00:00:00 2001 From: Jean-Roch Maitre Date: Fri, 29 May 2015 12:06:56 -0700 Subject: [PATCH 2/2] UI-1595: Fix links alignment in SmartPBX Users --- submodules/users/users.css | 9 +++++++++ views/users-devices.html | 2 +- views/users-numbers.html | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/submodules/users/users.css b/submodules/users/users.css index 9a0b169..07cd9c7 100644 --- a/submodules/users/users.css +++ b/submodules/users/users.css @@ -251,6 +251,15 @@ margin-right: 10px; } +#users_container .actions .spare-devices { + line-height: 30px; + margin-left: 10px; +} + +#users_container .actions .buy-dropdown { + margin-top: 2px; +} + /* Detail User */ #users_container .detail-user .user-fields { -webkit-box-sizing: border-box; diff --git a/views/users-devices.html b/views/users-devices.html index 1233fc7..2a5f497 100644 --- a/views/users-devices.html +++ b/views/users-devices.html @@ -31,7 +31,7 @@
  • {{ i18n.devices.types.ata }}
    • - {{ i18n.users.devices.spareDevice }} + {{ i18n.users.devices.spareDevice }}
    {{ i18n.cancel }} diff --git a/views/users-numbers.html b/views/users-numbers.html index 01d1e98..1998371 100644 --- a/views/users-numbers.html +++ b/views/users-numbers.html @@ -56,7 +56,7 @@ {{ i18n.users.addFromSpare }} -