From fdd28ef013e73aa8de9b7e844f6398ed08885035 Mon Sep 17 00:00:00 2001
From: Jean-Roch Maitre <jr@2600hz.com>
Date: Mon, 30 Mar 2015 15:20:10 -0700
Subject: [PATCH 1/4] UI-1328: Fixed i18n links

---
 views/groups-numbers.html | 2 +-
 views/users-numbers.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/groups-numbers.html b/views/groups-numbers.html
index dbdf59f..ef8f6f8 100644
--- a/views/groups-numbers.html
+++ b/views/groups-numbers.html
@@ -51,7 +51,7 @@
 
 	<div class="actions">
 		<a href="#" class="spare-link monster-link pull-left{{#if emptySpare}} disabled{{/if}}">
-			<i class="icon-plus icon-green icon-large"></i>Add from Spare Numbers
+			<i class="icon-plus icon-green icon-large"></i>{{ i18n.groups.addFromSpare }}
 		</a>
 		<ul class="nav pull-left">
 			<li class="dropdown">
diff --git a/views/users-numbers.html b/views/users-numbers.html
index bb8c34b..1d4ab0b 100644
--- a/views/users-numbers.html
+++ b/views/users-numbers.html
@@ -51,7 +51,7 @@
 
 	<div class="actions">
 		<a href="#" class="spare-link monster-link pull-left{{#if emptySpare}} disabled{{/if}}">
-			<i class="icon-plus icon-green icon-large"></i>Add from Spare Numbers
+			<i class="icon-plus icon-green icon-large"></i>{{ i18n.users.addFromSpare }}
 		</a>
 		<ul class="nav pull-left">
 			<li class="dropdown">

From 9ae8f97348ebb51f0bf4729e14b1d77ae087a6f3 Mon Sep 17 00:00:00 2001
From: Jean-Roch Maitre <jr@2600hz.com>
Date: Mon, 30 Mar 2015 15:30:52 -0700
Subject: [PATCH 2/4] UI-1338: Added russian language as a possible language in
 the user settings

---
 views/users-name.html | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/views/users-name.html b/views/users-name.html
index 35daab4..46c642f 100644
--- a/views/users-name.html
+++ b/views/users-name.html
@@ -67,9 +67,12 @@
 			<div class="row-fields">
             	<div class="icon-wrapper" data-original-title="{{i18n.users.editionForm.languageHelp}}" data-placement="top" data-toggle="tooltip"><i class="icon-flag"></i></div>
 				<select id="user_language" name="extra.language">
-					<option value="auto">{{i18n.languages.auto}}</option>
-					<option value="en-US"{{#compare language '===' 'en-US'}} selected{{/compare}}>{{i18n.languages.americanEnglish}}</option>
-					<option value="fr-FR"{{#compare language '===' 'fr-FR'}} selected{{/compare}}>{{i18n.languages.frenchFrench}}</option>
+					{{#select language}}
+						<option value="auto">{{i18n.languages.auto}}</option>
+						<option value="en-US">{{i18n.languages.americanEnglish}}</option>
+						<option value="fr-FR">{{i18n.languages.frenchFrench}}</option>
+						<option value="ru-RU">{{i18n.languages.russianRussian}}</option>
+					{{/select}}
 				</select>
 			</div>
 

From 8dda634f90af77f07d5273707f6c9722c95510e1 Mon Sep 17 00:00:00 2001
From: Jean-Roch Maitre <jr@2600hz.com>
Date: Tue, 31 Mar 2015 12:00:37 -0700
Subject: [PATCH 3/4] UI-1340: Fixed call to numbers submodule

---
 submodules/myOffice/myOffice.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/myOffice/myOffice.js b/submodules/myOffice/myOffice.js
index aa8bcfd..d04e475 100644
--- a/submodules/myOffice/myOffice.js
+++ b/submodules/myOffice/myOffice.js
@@ -532,7 +532,7 @@ define(function(require){
 						break;
 					case "numbers":
 						$('.category#numbers').addClass('active');
-						monster.pub('voip.numbers.render', parent);
+						monster.pub('voip.numbers.render', { parent: parent });
 						break;
 					case "strategy":
 						$('.category#strategy').addClass('active');

From 0c0175fb4fdab498084b23903efb7c686c4dd53a Mon Sep 17 00:00:00 2001
From: Jean-Roch Maitre <jr@2600hz.com>
Date: Tue, 31 Mar 2015 14:36:34 -0700
Subject: [PATCH 4/4] UI-1331: Fixed an issue where buying a number would not
 add it properly to the user's / groups' numbers

---
 submodules/groups/groups.js      | 6 +++---
 submodules/users/users.js        | 5 +++--
 views/groups-numbersItemRow.html | 2 +-
 views/users-numbersItemRow.html  | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/submodules/groups/groups.js b/submodules/groups/groups.js
index 9e5b3c0..53f0656 100644
--- a/submodules/groups/groups.js
+++ b/submodules/groups/groups.js
@@ -989,11 +989,12 @@ define(function(require){
 							monster.pub('common.numbers.getListFeatures', function(features) {
 								_.each(numbers, function(number, k) {
 									number.viewFeatures = $.extend(true, {}, features);
+									number.phoneNumber = number.id;
 
 									var rowTemplate = monster.template(self, 'groups-numbersItemRow', { number: number });
 
-									template.find('.list-unassigned-items .empty-row').hide();
-									template.find('.list-unassigned-items').append(rowTemplate);
+									template.find('.list-assigned-items .empty-row').hide();
+									template.find('.list-assigned-items').append(rowTemplate);
 								});
 							});
 						}
@@ -1263,7 +1264,6 @@ define(function(require){
 					unassignedNumbers: {}
 				};
 
-
 			monster.pub('common.numbers.getListFeatures', function(features) {
 				_.each(data.numbers.numbers, function(number, id) {
 					/* Formating number */
diff --git a/submodules/users/users.js b/submodules/users/users.js
index b9f10c6..2944cd2 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -1026,11 +1026,12 @@ define(function(require){
 							monster.pub('common.numbers.getListFeatures', function(features) {
 								_.each(numbers, function(number, k) {
 									number.viewFeatures = $.extend(true, {}, features);
+									number.phoneNumber = number.id;
 
 									var rowTemplate = monster.template(self, 'users-numbersItemRow', { number: number });
 
-									template.find('.list-unassigned-items .empty-row').hide();
-									template.find('.list-unassigned-items').append(rowTemplate);
+									template.find('.list-assigned-items .empty-row').hide();
+									template.find('.list-assigned-items').append(rowTemplate);
 								});
 							});
 						}
diff --git a/views/groups-numbersItemRow.html b/views/groups-numbersItemRow.html
index e5492eb..aaeb265 100644
--- a/views/groups-numbersItemRow.html
+++ b/views/groups-numbersItemRow.html
@@ -1,4 +1,4 @@
-<div class="item-row" data-id="{{number.phoneNumber}}" data-search="{{formatPhoneNumber number.phoneNumber}} {{number.phoneNumber}} {{number.locality.city}} {{number.locality.country}}">
+<div class="item-row" data-id="{{number.phoneNumber}}">
 	<div class="features-block pull-right">
 		<div class="edit-features">
 			<div class="navbar">
diff --git a/views/users-numbersItemRow.html b/views/users-numbersItemRow.html
index e5492eb..aaeb265 100644
--- a/views/users-numbersItemRow.html
+++ b/views/users-numbersItemRow.html
@@ -1,4 +1,4 @@
-<div class="item-row" data-id="{{number.phoneNumber}}" data-search="{{formatPhoneNumber number.phoneNumber}} {{number.phoneNumber}} {{number.locality.city}} {{number.locality.country}}">
+<div class="item-row" data-id="{{number.phoneNumber}}">
 	<div class="features-block pull-right">
 		<div class="edit-features">
 			<div class="navbar">