diff --git a/web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/sub-components-automatic-backup/documentsModule.js b/web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/sub-components-automatic-backup/documentsModule.js index 601c696581..a4e18f176f 100644 --- a/web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/sub-components-automatic-backup/documentsModule.js +++ b/web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/sub-components-automatic-backup/documentsModule.js @@ -106,10 +106,9 @@ class DocumentsModule extends React.Component { this.setState({ isLoading: true }, function () { +defaultStorageType === 0 - ? getFolderPath(defaultSelectedFolder) + ? SelectedFolder.getFolderPath(defaultSelectedFolder) .then((folderPath) => { - debugger; - this.folderThirdPartyModulePath = folderPath; + this.folderDocumentsModulePath = folderPath; }) .then( () => @@ -414,7 +413,7 @@ class DocumentsModule extends React.Component { this.onSelectFolder([`${folderId}`]); } }) - .then(() => getFolderPath(folderId)) + .then(() => SelectedFolder.getFolderPath(folderId)) .then((folderPath) => { this.folderDocumentsModulePath = folderPath; }) @@ -560,8 +559,8 @@ class DocumentsModule extends React.Component { onSetLoadingData, } = this.props; - console.log("documents module render", selectedFolder); - console.log("___"); + // console.log("documents module render", this.folderDocumentsModulePath); + // console.log("___"); return (
<> @@ -572,13 +571,12 @@ class DocumentsModule extends React.Component { onClose={this.onClose} //здесь onClickInput={this.onClickInput} //здесь isPanelVisible={isPanelVisible} //здесь - folderPath={this.folderThirdPartyModulePath} + folderPath={this.folderDocumentsModulePath} isSetDefaultFolderPath={isSetDefaultFolderPath} //здесь isError={isError} //здесь onSetLoadingData={onSetLoadingData} isCommonFolders isCommonWithoutProvider - withoutTopLevelFolder isSavingProcess={isLoadingData} /> ) : ( diff --git a/web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/sub-components-automatic-backup/thirdPartyModule.js b/web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/sub-components-automatic-backup/thirdPartyModule.js index 88bff1c942..2ada5dbb9c 100644 --- a/web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/sub-components-automatic-backup/thirdPartyModule.js +++ b/web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/sub-components-automatic-backup/thirdPartyModule.js @@ -54,7 +54,12 @@ class ThirdPartyModule extends React.Component { timeFromSessionStorage = getFromSessionStorage("time"); maxCopiesFromSessionStorage = getFromSessionStorage("maxCopies"); weekdayNameFromSessionStorage = getFromSessionStorage("weekdayName"); - + const monthNumber = monthlySchedule + ? dayFromSessionStorage || `${defaultDay}` + : "1"; + const weekdayNumber = weeklySchedule + ? dayFromSessionStorage || defaultDay + : "2"; this.state = { isPanelVisible: false, isChanged: false, @@ -72,9 +77,9 @@ class ThirdPartyModule extends React.Component { t("DailyPeriodSchedule"), selectedWeekdayOption: weekdayNameFromSessionStorage || selectedWeekdayOption, - selectedNumberWeekdayOption: dayFromSessionStorage || defaultDay || "2", + selectedNumberWeekdayOption: weekdayNumber, selectedTimeOption: defaultHour || "12:00", - selectedMonthOption: dayFromSessionStorage || defaultDay || "1", + selectedMonthOption: monthNumber, selectedMaxCopies: maxCopiesFromSessionStorage || defaultMaxCopies || "10", selectedNumberMaxCopies: @@ -98,7 +103,7 @@ class ThirdPartyModule extends React.Component { //debugger; this.setState({ isLoading: true }, function () { +defaultStorageType === 1 - ? getFolderPath(defaultSelectedFolder) + ? SelectedFolder.getFolderPath(defaultSelectedFolder) .then( (folderPath) => (this.folderThirdPartyModulePath = folderPath) ) @@ -404,7 +409,7 @@ class ThirdPartyModule extends React.Component { this.onSelectFolder([`${folderId}`]); } }) - .then(() => getFolderPath(folderId)) + .then(() => SelectedFolder.getFolderPath(folderId)) .then((folderPath) => { this.folderThirdPartyModulePath = folderPath; }) @@ -549,8 +554,8 @@ class ThirdPartyModule extends React.Component { onSetLoadingData, } = this.props; //console.log("selectedFolder THRDPARTY", selectedFolder); - console.log("third-party", isLoading); - console.log("___"); + // console.log("third-party module render", this.folderThirdPartyModulePath); + // console.log("___"); return (
<>