From 0b2cb9f13dc454865a2fdac09b96a288324f24cd Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Fri, 11 Jun 2021 16:15:57 +0300 Subject: [PATCH] [SSE mobile] Fix bug 50824 --- .../controller/settings/SpreadsheetInfo.jsx | 36 ++++++++++--------- .../src/view/settings/SpreadsheetInfo.jsx | 8 ++--- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/src/controller/settings/SpreadsheetInfo.jsx b/apps/spreadsheeteditor/mobile/src/controller/settings/SpreadsheetInfo.jsx index 238036bcd..a3325b307 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/settings/SpreadsheetInfo.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/settings/SpreadsheetInfo.jsx @@ -6,13 +6,17 @@ class SpreadsheetInfoController extends Component { constructor(props) { super(props); this.docProps = this.getDocProps(); - this.getModified = this.getModified(); - this.getModifiedBy = this.getModifiedBy(); - this.getCreators = this.getCreators(); - this.title = this.getTitle(); - this.subject = this.getSubject(); - this.description = this.getDescription(); - this.getCreated = this.getCreated(); + if (this.docProps) { + this.dataApp = this.getAppProps(); + this.modified = this.getModified(); + this.modifiedBy = this.getModifiedBy(); + this.creators = this.getCreators(); + this.title = this.getTitle(); + this.subject = this.getSubject(); + this.description = this.getDescription(); + this.created = this.getCreated(); + + } } getDocProps() { @@ -23,7 +27,6 @@ class SpreadsheetInfoController extends Component { getAppProps() { const api = Common.EditorApi.get(); const appProps = api.asc_getAppProps(); - if (appProps) { let appName = (appProps.asc_getApplication() || "") + @@ -31,12 +34,12 @@ class SpreadsheetInfoController extends Component { (appProps.asc_getAppVersion() || ""); return appName; } + return null; } getModified() { let valueModified = this.docProps.asc_getModified(); const _lang = this.props.storeAppOptions.lang; - if (valueModified) { return ( valueModified.toLocaleString(_lang, { @@ -48,14 +51,15 @@ class SpreadsheetInfoController extends Component { valueModified.toLocaleTimeString(_lang, { timeStyle: "short" }) ); } + return null; } getModifiedBy() { let valueModifiedBy = this.docProps.asc_getLastModifiedBy(); - if (valueModifiedBy) { return Common.Utils.UserInfoParser.getParsedName(valueModifiedBy); } + return null; } getCreators() { @@ -77,20 +81,20 @@ class SpreadsheetInfoController extends Component { getCreated() { let value = this.docProps.asc_getCreated(); const _lang = this.props.storeAppOptions.lang; - if(value) { return value.toLocaleString(_lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleTimeString(_lang, {timeStyle: 'short'}); } + return null; } render() { return ( { const { t } = useTranslation(); const _t = t("View.Settings", { returnObjects: true }); const storeSpreadsheetInfo = props.storeSpreadsheetInfo; - const dataApp = props.getAppProps(); - const dataModified = props.getModified; - const dataModifiedBy = props.getModifiedBy; - const creators = props.getCreators; const dataDoc = storeSpreadsheetInfo.dataDoc; + const dataApp = props.dataApp; + const dataModified = props.modified; + const dataModifiedBy = props.modifiedBy; + const creators = props.creators; return (