Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge conflicts (name renamed to model_name) for models

Browse Source
This commit is contained in:
blessedcoolant 2023-07-14 15:53:28 +12:00
parent 16e93c6455
commit abe2a0f9b4
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
invokeai/frontend/web/src/features/ui/components/tabs/ModelManager/subpanels/ModelManagerPanel/CheckpointModelEdit.tsx
View File

@ -71,7 +71,7 @@ export default function CheckpointModelEdit(props: CheckpointModelEditProps) {
const editModelFormSubmitHandler = (values: CheckpointModelConfig) => { const editModelFormSubmitHandler = (values: CheckpointModelConfig) => {
const responseBody = { const responseBody = {
base_model: retrievedModel.base_model, base_model: retrievedModel.base_model,
model_name: retrievedModel.name, model_name: retrievedModel.model_name,
body: values, body: values,
}; };
updateMainModel(responseBody); updateMainModel(responseBody);

2
invokeai/frontend/web/src/features/ui/components/tabs/ModelManager/subpanels/ModelManagerPanel/DiffusersModelEdit.tsx
View File

@ -67,7 +67,7 @@ export default function DiffusersModelEdit(props: DiffusersModelEditProps) {
const editModelFormSubmitHandler = (values: DiffusersModelConfig) => { const editModelFormSubmitHandler = (values: DiffusersModelConfig) => {
const responseBody = { const responseBody = {
base_model: retrievedModel.base_model, base_model: retrievedModel.base_model,
model_name: retrievedModel.name, model_name: retrievedModel.model_name,
body: values, body: values,
}; };
updateMainModel(responseBody); updateMainModel(responseBody);

10
invokeai/frontend/web/src/features/ui/components/tabs/ModelManager/subpanels/ModelManagerPanel/ModelConvert.tsx
View File

@ -38,7 +38,7 @@ export default function ModelConvert(props: ModelConvertProps) {
const modelConvertHandler = () => { const modelConvertHandler = () => {
const responseBody = { const responseBody = {
base_model: model.base_model, base_model: model.base_model,
model_name: model.name, model_name: model.model_name,
}; };
convertModel(responseBody); convertModel(responseBody);
@ -46,7 +46,9 @@ export default function ModelConvert(props: ModelConvertProps) {
dispatch( dispatch(
addToast( addToast(
makeToast({ makeToast({
title: `${t('modelManager.modelConversionFailed')}: ${model.name}`, title: `${t('modelManager.modelConversionFailed')}: ${
model.model_name
}`,
status: 'error', status: 'error',
}) })
) )
@ -57,7 +59,7 @@ export default function ModelConvert(props: ModelConvertProps) {
dispatch( dispatch(
addToast( addToast(
makeToast({ makeToast({
title: `${t('modelManager.modelConverted')}: ${model.name}`, title: `${t('modelManager.modelConverted')}: ${model.model_name}`,
status: 'success', status: 'success',
}) })
) )
@ -67,7 +69,7 @@ export default function ModelConvert(props: ModelConvertProps) {
return ( return (
<IAIAlertDialog <IAIAlertDialog
title={`${t('modelManager.convert')} ${model.name}`} title={`${t('modelManager.convert')} ${model.model_name}`}
acceptCallback={modelConvertHandler} acceptCallback={modelConvertHandler}
cancelCallback={modelConvertCancelHandler} cancelCallback={modelConvertCancelHandler}
acceptButtonText={`${t('modelManager.convert')}`} acceptButtonText={`${t('modelManager.convert')}`}