expo-20 user cabinet completed

templates/client/static_client/js/_modules/page.profile.js

@@ -175,9 +175,14 @@ if (EXPO.profile){
 				 * @param data -data object recieved from server
 				 */
 				this.pullHandler = function (data) {
+					var staticText,
+						work_fieldValue = $.trim($('#s2id_id_company').text());
 					if (data.success){
-						$('#static-work-value').text($('#id_position').val());
+						staticText = $('#id_position').val();
-
+						if(work_fieldValue != ''){
+							staticText += ' '+ EXPO.profile.opt.lang.workIn + ' '+work_fieldValue;
+						}
+						$('#static-work-value').text(staticText);
 						$('.p-editable').removeClass('pe-current');
 						this.refreshState();
 
@@ -199,7 +204,6 @@ if (EXPO.profile){
 						$('.p-editable').removeClass('pe-current');
 						this.refreshState();
 
-
 					}
 				};
 				this.ajaxPath = path;
@@ -374,7 +378,7 @@ if (EXPO.profile){
 		//инициализация общих свойств
 		that.init = function(options) {
 			$.extend(this.lang, options.lang);
-			options.lang = null;
+			//options.lang = null;
 			$.extend(this.opt, options);
 
 			var self = this,