Merge branch 'master' of github.com:2600hz/monster-ui-voip

submodules/callLogs/callLogs.js

@@ -366,7 +366,7 @@ define(function(require){
 								  + "%0D%0AHangup Cause: " + (cdr.hangup_cause || "")
 								  + "%0D%0ACall ID: " + cdr.call_id
 								  + "%0D%0AOther Leg Call ID: " + (cdr.other_leg_call_id || "")
-								  + "%0D%0AHandling Server: " + (cdr.handling_server || "")
+								  + "%0D%0AHandling Server: " + (cdr.media_server || "")
 					};
 				};
 

submodules/myOffice/myOffice.js

@@ -6,7 +6,19 @@ define(function(require){
 
 	var app = {
 
-		requests: {},
+		requests: {
+			'google.geocode.address': {
+				apiRoot: '//maps.googleapis.com/',
+				url: 'maps/api/geocode/json?address={zipCode}',
+				verb: 'GET',
+				generateError: false,
+				removeHeaders: [
+					'X-Kazoo-Cluster-ID',
+					'X-Auth-Token',
+					'Content-Type'
+				]
+			}
+		},
 
 		subscribe: {
 			'voip.myOffice.render': 'myOfficeRender',
@@ -908,12 +920,21 @@ define(function(require){
 			});
 
 			emergencyZipcodeInput.on('blur', function() {
-				$.getJSON('http://www.geonames.org/postalCodeLookupJSON?&country=US&callback=?', { postalcode: $(this).val() }, function(response) {
-					if (response && response.postalcodes.length && response.postalcodes[0].placeName) {
-						emergencyCityInput.val(response.postalcodes[0].placeName);
-						emergencyStateInput.val(response.postalcodes[0].adminName1);
-					}
-				});
+				var zipCode = $(this).val();
+
+				if (zipCode) {
+					self.myOfficeGetAddessFromZipCode({
+						data: {
+							zipCode: zipCode
+						},
+						success: function(results) {
+							if (!_.isEmpty(results)) {
+								emergencyCityInput.val(results[0].address_components[1].long_name);
+								emergencyStateInput.val(results[0].address_components[3].short_name);
+							}
+						}
+					});
+				}
 			});
 
 			popupTemplate.find('.save').on('click', function() {
@@ -1141,6 +1162,21 @@ define(function(require){
 					callback && callback(savedUser.data);
 				}
 			});
+		},
+
+		myOfficeGetAddessFromZipCode: function(args) {
+			var self = this;
+
+			monster.request({
+				resource: 'google.geocode.address',
+				data: args.data,
+				success: function(data, status) {
+					args.hasOwnProperty('success') && args.success(data.results);
+				},
+				error: function(errorPayload, data, globalHandler) {
+					args.hasOwnProperty('error') ? args.error() : globalHandler(data, { generateError: true });
+				}
+			});
 		}
 	};
 

submodules/users/users.js

@@ -656,6 +656,9 @@ define(function(require){
 								var dataForm = monster.ui.getFormData('form_user_creation'),
 									formattedData = self.usersFormatCreationData(dataForm);
 
+								$(this)
+									.prop({ disabled: 'true' });
+
 								self.usersCreate(formattedData, function(data) {
 									popup.dialog('close').remove();
 

views/callLogs-cdrsList.html

@@ -42,7 +42,7 @@
 		</div>
 		<div class="grid-cell actions">
 			<div class="sub-cell single-cell">
-				{{#if ../showReport}}<a class="monster-link" href="{{this.mailtoLink}}"><i data-placement="top" data-toggle="tooltip" data-placement="top" data-original-title="{{ @root.i18n.callLogs.actions.report }}" class="fa fa-lg fa-fire-extinguisher"></i></a>{{/if}}
+				{{#if ../showReport}}<a class="monster-link" target="_blank" href="{{this.mailtoLink}}"><i data-placement="top" data-toggle="tooltip" data-placement="top" data-original-title="{{ @root.i18n.callLogs.actions.report }}" class="fa fa-lg fa-fire-extinguisher"></i></a>{{/if}}
 			</div>
 		</div>
 	</div>