diff options
author | vantezzen <hello@vantezzen.io> | 2019-10-17 21:45:24 +0200 |
---|---|---|
committer | vantezzen <hello@vantezzen.io> | 2019-10-17 21:45:24 +0200 |
commit | ad97ba68b004b746d1e78cedc87a2dab9b93d3c5 (patch) | |
tree | d6a57868a1bb4aa23c13fac0f2d47d7fc8d9c250 /app/Controllers/Http/RecipeController.js | |
parent | Add announcements (diff) | |
download | ferdium-server-ad97ba68b004b746d1e78cedc87a2dab9b93d3c5.tar.gz ferdium-server-ad97ba68b004b746d1e78cedc87a2dab9b93d3c5.tar.zst ferdium-server-ad97ba68b004b746d1e78cedc87a2dab9b93d3c5.zip |
Fix compatability to Postgresql databases
Diffstat (limited to 'app/Controllers/Http/RecipeController.js')
-rw-r--r-- | app/Controllers/Http/RecipeController.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/Controllers/Http/RecipeController.js b/app/Controllers/Http/RecipeController.js index 880f0c3..6c8aa21 100644 --- a/app/Controllers/Http/RecipeController.js +++ b/app/Controllers/Http/RecipeController.js | |||
@@ -35,7 +35,7 @@ class RecipeController { | |||
35 | const customRecipes = customRecipesArray.map((recipe) => ({ | 35 | const customRecipes = customRecipesArray.map((recipe) => ({ |
36 | id: recipe.recipeId, | 36 | id: recipe.recipeId, |
37 | name: recipe.name, | 37 | name: recipe.name, |
38 | ...JSON.parse(recipe.data), | 38 | ...typeof recipe.data === "string" ? JSON.parse(recipe.data) : recipe.data, |
39 | })); | 39 | })); |
40 | 40 | ||
41 | const recipes = [ | 41 | const recipes = [ |
@@ -144,7 +144,7 @@ class RecipeController { | |||
144 | results = dbResults.map((recipe) => ({ | 144 | results = dbResults.map((recipe) => ({ |
145 | id: recipe.recipeId, | 145 | id: recipe.recipeId, |
146 | name: recipe.name, | 146 | name: recipe.name, |
147 | ...JSON.parse(recipe.data), | 147 | ...typeof recipe.data === "string" ? JSON.parse(recipe.data) : recipe.data, |
148 | })); | 148 | })); |
149 | } else { | 149 | } else { |
150 | let remoteResults = []; | 150 | let remoteResults = []; |
@@ -155,7 +155,7 @@ class RecipeController { | |||
155 | const localResults = localResultsArray.map((recipe) => ({ | 155 | const localResults = localResultsArray.map((recipe) => ({ |
156 | id: recipe.recipeId, | 156 | id: recipe.recipeId, |
157 | name: recipe.name, | 157 | name: recipe.name, |
158 | ...JSON.parse(recipe.data), | 158 | ...typeof recipe.data === "string" ? JSON.parse(recipe.data) : recipe.data, |
159 | })); | 159 | })); |
160 | 160 | ||
161 | results = [ | 161 | results = [ |