Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[PE mobile] [SSE mobile] Fixed fill user info.

Browse source
This commit is contained in:
Julia Radzhabova 2016-11-24 17:13:27 +03:00
parent d911b61ddd
commit b7c6ebc08e
2 changed files with 2 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/presentationeditor/mobile/app/controller/Main.js
View file

@ -55,20 +55,6 @@ define([
Common.localStorage.setKeysFilter('pe-,asc.presentation');
Common.localStorage.sync();
var fillUserInfo = function(info, lang, defname) {
var user = info || {};
!user.id && (user.id = ('uid-' + Date.now()));
_.isEmpty(user.firstname) && _.isEmpty(user.lastname) && (user.firstname = defname);
if (_.isEmpty(user.firstname))
user.fullname = user.lastname;
else if (_.isEmpty(user.lastname))
user.fullname = user.firstname;
else
user.fullname = /^ru/.test(lang) ? user.lastname + ' ' + user.firstname : user.firstname + ' ' + user.lastname;
return user;
};
return {
models: [],
collections: [],
@ -159,7 +145,7 @@ define([
me.editorConfig = $.extend(me.editorConfig, data.config);
me.editorConfig.user =
me.appOptions.user = fillUserInfo(me.editorConfig.user, me.editorConfig.lang, me.textAnonymous);
me.appOptions.user = Common.Utils.fillUserInfo(me.editorConfig.user, me.editorConfig.lang, me.textAnonymous);
me.appOptions.nativeApp = me.editorConfig.nativeApp === true;
me.appOptions.isDesktopApp = me.editorConfig.targetApp == 'desktop';
me.appOptions.canCreateNew = !_.isEmpty(me.editorConfig.createUrl) && !me.appOptions.isDesktopApp;
@ -198,8 +184,6 @@ define([
var _user = new Asc.asc_CUserInfo();
_user.put_Id(this.appOptions.user.id);
_user.put_FirstName(this.appOptions.user.firstname);
_user.put_LastName(this.appOptions.user.lastname);
_user.put_FullName(this.appOptions.user.fullname);
docInfo = new Asc.asc_CDocInfo();

18
apps/spreadsheeteditor/mobile/app/controller/Main.js
View file

@ -57,20 +57,6 @@ define([
Common.localStorage.setKeysFilter('sse-,asc.table');
Common.localStorage.sync();
var fillUserInfo = function(info, lang, defname) {
var user = info || {};
!user.id && (user.id = ('uid-' + Date.now()));
_.isEmpty(user.firstname) && _.isEmpty(user.lastname) && (user.firstname = defname);
if (_.isEmpty(user.firstname))
user.fullname = user.lastname;
else if (_.isEmpty(user.lastname))
user.fullname = user.firstname;
else
user.fullname = /^ru/.test(lang) ? user.lastname + ' ' + user.firstname : user.firstname + ' ' + user.lastname;
return user;
};
return {
models: [],
collections: [],
@ -160,7 +146,7 @@ define([
this.editorConfig = $.extend(this.editorConfig, data.config);
this.editorConfig.user =
this.appOptions.user = fillUserInfo(this.editorConfig.user, this.editorConfig.lang, this.textAnonymous);
this.appOptions.user = Common.Utils.fillUserInfo(this.editorConfig.user, this.editorConfig.lang, this.textAnonymous);
this.appOptions.nativeApp = this.editorConfig.nativeApp === true;
this.appOptions.isDesktopApp = this.editorConfig.targetApp == 'desktop';
this.appOptions.canCreateNew = !_.isEmpty(this.editorConfig.createUrl) && !this.appOptions.isDesktopApp;
@ -198,8 +184,6 @@ define([
var _user = new Asc.asc_CUserInfo();
_user.put_Id(this.appOptions.user.id);
_user.put_FirstName(this.appOptions.user.firstname);
_user.put_LastName(this.appOptions.user.lastname);
_user.put_FullName(this.appOptions.user.fullname);
docInfo = new Asc.asc_CDocInfo();