pakin/Taobin-Recipe-Manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(merge_component): ✨ add 3 ways merging

Browse source 
WIP 3 ways merging, can now merge from third source on web client
This commit is contained in:
pakintada@gmail.com 2024-03-10 19:10:08 +07:00
parent 1b96e298ee
commit 47357e7ab4
8 changed files with 284 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/routers/recipe.go
View file

@ -909,7 +909,7 @@ func (rr *RecipeRouter) upgradeVersion(w http.ResponseWriter, r *http.Request) {
// upgrade version
// merge from website
result, err := rr.data.Merge(countryID, filename, mode, changeKey, nil)
result, err := rr.data.Merge(countryID, filename, mode, changeKey, appliedMachineRecipe)
if err != nil {
rr.taoLogger.Log.Error("RecipeRouter.upgradeVersion", zap.Error(err))
http.Error(w, err.Error(), http.StatusInternalServerError)