Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public virtual async Task<T> GetSettingByKey<T>(string key, T defaultValue = def

var setting = settings.FirstOrDefault(x => x.StoreId == storeId) ??
settings.FirstOrDefault(x => string.IsNullOrEmpty(x.StoreId));
return setting != null ? Task.FromResult(JsonSerializer.Deserialize<T>(setting.Metadata)) : Task.FromResult(defaultValue);
return setting != null ? Task.FromResult(JsonSerializer.Deserialize<T>((string)setting.Metadata)) : Task.FromResult(defaultValue);
});
}

Expand Down Expand Up @@ -205,7 +205,7 @@ public virtual ISettings LoadSetting(Type type, string storeId = "")
setting = settings.FirstOrDefault(x => string.IsNullOrEmpty(x.StoreId));

if (setting != null)
return JsonSerializer.Deserialize(setting.Metadata, type) as ISettings;
return JsonSerializer.Deserialize((string)setting.Metadata, type) as ISettings;

return Activator.CreateInstance(type) as ISettings;
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ private object GetCellValue(ICell cell, ColumnInfo targetColumn)
case CellType.String:
default:
if (targetColumn.Json)
return JsonSerializer.Deserialize(cell.StringCellValue, targetColumn.PropertyType);
return JsonSerializer.Deserialize((string)cell.StringCellValue, targetColumn.PropertyType);
return cell.StringCellValue;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public async Task BindModelAsync(ModelBindingContext bindingContext)
};
options.Converters.Add(new StringConverter());
bindingContext.Result =
ModelBindingResult.Success(JsonSerializer.Deserialize(jsonPayload, bindingContext.ModelType, options));
ModelBindingResult.Success(JsonSerializer.Deserialize((string)jsonPayload, bindingContext.ModelType, options));
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion src/Web/Grand.Web.Common/Extensions/SessionExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ public static void Set<T>(this ISession session, string key, T value)
public static T Get<T>(this ISession session, string key)
{
var value = session.GetString(key);
return value == null ? default : JsonSerializer.Deserialize<T>(value);
return value == null ? default : JsonSerializer.Deserialize<T>((string)value);
}
}