Delphi/delphimvcframework
1
0
Fork 0
mirror of https://github.com/danieleteti/delphimvcframework.git synced 2024-11-15 15:55:54 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature_dmscontainer_v3_1

Browse Source
This commit is contained in:
Daniele Teti 2021-02-15 18:29:27 +01:00
commit 33083497cd
4 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sources/MVCFramework.Serializer.JsonDataObjects.CustomTypes.pas
View File

@ -600,7 +600,7 @@ var
lJsonArray: TJsonArray; lJsonArray: TJsonArray;
i: Integer; i: Integer;
begin begin
lList := AElementValue.AsObject as TList<string>; lList := TMVCListOfString(AElementValue.AsObject);
lList.Clear; lList.Clear;
lJsonArray := ASerializerObject as TJsonArray; lJsonArray := ASerializerObject as TJsonArray;
for i := 0 to lJsonArray.Count - 1 do for i := 0 to lJsonArray.Count - 1 do
@ -650,7 +650,7 @@ var
lJsonArray: TJsonArray; lJsonArray: TJsonArray;
i: Integer; i: Integer;
begin begin
lList := AElementValue.AsObject as TList<Integer>; lList := TMVCListOfInteger(AElementValue.AsObject);
lList.Clear; lList.Clear;
lJsonArray := ASerializerObject as TJsonArray; lJsonArray := ASerializerObject as TJsonArray;
for i := 0 to lJsonArray.Count - 1 do for i := 0 to lJsonArray.Count - 1 do
@ -701,7 +701,7 @@ var
lJsonArray: TJsonArray; lJsonArray: TJsonArray;
i: Integer; i: Integer;
begin begin
lList := AElementValue.AsObject as TList<Boolean>; lList := TMVCListOfBoolean(AElementValue.AsObject);
lList.Clear; lList.Clear;
lJsonArray := ASerializerObject as TJsonArray; lJsonArray := ASerializerObject as TJsonArray;
for i := 0 to lJsonArray.Count - 1 do for i := 0 to lJsonArray.Count - 1 do
@ -751,7 +751,7 @@ var
lJsonArray: TJsonArray; lJsonArray: TJsonArray;
i: Integer; i: Integer;
begin begin
lList := AElementValue.AsObject as TList<Double>; lList := TMVCListOfDouble(AElementValue.AsObject);
lList.Clear; lList.Clear;
lJsonArray := ASerializerObject as TJsonArray; lJsonArray := ASerializerObject as TJsonArray;
for i := 0 to lJsonArray.Count - 1 do for i := 0 to lJsonArray.Count - 1 do

8
sources/MVCFramework.pas
View File

@ -2766,10 +2766,10 @@ begin
begin begin
try try
AHandled := ExecuteAction(ASender, ARequest, AResponse); AHandled := ExecuteAction(ASender, ARequest, AResponse);
// if not AHandled then if not AHandled then
// begin begin
// AResponse.ContentStream := nil; AResponse.ContentStream := nil;
// end; end;
except except
on E: Exception do on E: Exception do
begin begin

3
unittests/general/Several/DMVCFrameworkTests.dpr
View File

@ -50,7 +50,8 @@ uses
FDConnectionConfigU in 'webmodules\FDConnectionConfigU.pas', FDConnectionConfigU in 'webmodules\FDConnectionConfigU.pas',
StandaloneServerTestU in '..\StandaloneServer\StandaloneServerTestU.pas', StandaloneServerTestU in '..\StandaloneServer\StandaloneServerTestU.pas',
StandAloneServerWebModuleTest in '..\StandaloneServer\StandAloneServerWebModuleTest.pas' {TestWebModule2: TWebModule}, StandAloneServerWebModuleTest in '..\StandaloneServer\StandAloneServerWebModuleTest.pas' {TestWebModule2: TWebModule},
MVCFramework.Commons in '..\..\..\sources\MVCFramework.Commons.pas'; MVCFramework.Commons in '..\..\..\sources\MVCFramework.Commons.pas',
MVCFramework.Serializer.JsonDataObjects.CustomTypes in '..\..\..\sources\MVCFramework.Serializer.JsonDataObjects.CustomTypes.pas';
{$R *.RES} {$R *.RES}

13
unittests/general/Several/DMVCFrameworkTests.dproj
View File

@ -219,6 +219,7 @@
<DesignClass>TWebModule</DesignClass> <DesignClass>TWebModule</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="..\..\..\sources\MVCFramework.Commons.pas"/> <DCCReference Include="..\..\..\sources\MVCFramework.Commons.pas"/>
<DCCReference Include="..\..\..\sources\MVCFramework.Serializer.JsonDataObjects.CustomTypes.pas"/>
<BuildConfiguration Include="Base"> <BuildConfiguration Include="Base">
<Key>Base</Key> <Key>Base</Key>
</BuildConfiguration> </BuildConfiguration>
@ -333,6 +334,12 @@
<Overwrite>true</Overwrite> <Overwrite>true</Overwrite>
</Platform> </Platform>
</DeployFile> </DeployFile>
<DeployFile LocalName="bin\DMVCFrameworkTests.rsm" Configuration="TESTINSIGHT" Class="DebugSymbols">
<Platform Name="Win32">
<RemoteName>DMVCFrameworkTests.rsm</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployFile LocalName="$(BDS)\Redist\iossim32\libcgunwind.1.0.dylib" Class="DependencyModule"> <DeployFile LocalName="$(BDS)\Redist\iossim32\libcgunwind.1.0.dylib" Class="DependencyModule">
<Platform Name="iOSSimulator"> <Platform Name="iOSSimulator">
<Overwrite>true</Overwrite> <Overwrite>true</Overwrite>
@ -356,6 +363,12 @@
<Overwrite>true</Overwrite> <Overwrite>true</Overwrite>
</Platform> </Platform>
</DeployFile> </DeployFile>
<DeployFile LocalName="bin\DMVCFrameworkTests.exe" Configuration="TESTINSIGHT" Class="ProjectOutput">
<Platform Name="Win32">
<RemoteName>DMVCFrameworkTests.exe</RemoteName>
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployClass Name="AdditionalDebugSymbols"> <DeployClass Name="AdditionalDebugSymbols">
<Platform Name="OSX32"> <Platform Name="OSX32">
<Operation>1</Operation> <Operation>1</Operation>