Skip to content

Fixed company logo not uploading issue#1399 #1409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed company logo not uploading issue#1399 #1409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions backend/src/routes/coreRoutes/coreApi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,7 @@ router
router
.route('/setting/upload/:settingKey?')
.patch(
catchErrors(
singleStorageUpload({ entity: 'setting', fieldName: 'settingValue', fileType: 'image' })
),
singleStorageUpload({ entity: 'setting', fieldName: 'settingValue', fileType: 'image' }),
catchErrors(settingController.updateBySettingKey)
);
router.route('/setting/updateManySetting').patch(catchErrors(settingController.updateManySetting));
Expand Down
11 changes: 10 additions & 1 deletion frontend/src/modules/SettingModule/components/UpdateSettingForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { selectSettings } from '@/redux/settings/selectors';
import { Button, Form } from 'antd';
import Loading from '@/components/Loading';
import useLanguage from '@/locale/useLanguage';
import { notification } from 'antd';

export default function UpdateSettingForm({ config, children, withUpload, uploadSettingKey }) {
let { entity, settingsCategory } = config;
Expand All @@ -20,7 +21,12 @@ export default function UpdateSettingForm({ config, children, withUpload, upload
if (withUpload) {
if (fieldsValue.file) {
fieldsValue.file = fieldsValue.file[0].originFileObj;
}
} else {
notification.error({
message: translate('Please select a file to upload.'),
});
return;
}
dispatch(
settingsAction.upload({ entity, settingKey: uploadSettingKey, jsonData: fieldsValue })
);
Expand All @@ -35,6 +41,9 @@ export default function UpdateSettingForm({ config, children, withUpload, upload
}
};




useEffect(() => {
const current = result[settingsCategory];

Expand Down