Bug fixed:

・ライブラリNewtonsoft.Jsonのバージョンアップに対応。・サイトパッケージにインポート時にKeyNotFoundExceptionが発生する問題を解消。・項目の制御を含まない状況による制御が設定されたテーブルで自動ポストバック時にnull参照違反が発生する問題を解消。
Implem · Dec 9, 2022 · 02d84f9 · 02d84f9
1 parent d1fd101
commit 02d84f9
Show file tree

Hide file tree

Showing 17 changed files with 70 additions and 65 deletions.
diff --git a/Implem.CodeDefiner/Implem.CodeDefiner.csproj b/Implem.CodeDefiner/Implem.CodeDefiner.csproj
@@ -5,9 +5,9 @@
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2022</Copyright>
     <Description>This program does the automatic code creation and merging of existing code based on the definition. Also it will make the configuration change of sql server database.</Description>
-    <AssemblyVersion>1.3.26.0</AssemblyVersion>
-    <FileVersion>1.3.26.0</FileVersion>
-    <Version>1.3.26.0</Version>
+    <AssemblyVersion>1.3.26.1</AssemblyVersion>
+    <FileVersion>1.3.26.1</FileVersion>
+    <Version>1.3.26.1</Version>
 	  <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
 

diff --git a/Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj b/Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2022</Copyright>
-    <AssemblyVersion>1.3.26.0</AssemblyVersion>
-    <FileVersion>1.3.26.0</FileVersion>
-    <Version>1.3.26.0</Version>
+    <AssemblyVersion>1.3.26.1</AssemblyVersion>
+    <FileVersion>1.3.26.1</FileVersion>
+    <Version>1.3.26.1</Version>
 	<Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.DisplayAccessor/Implem.DisplayAccessor.csproj b/Implem.DisplayAccessor/Implem.DisplayAccessor.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2022</Copyright>
-    <AssemblyVersion>1.3.26.0</AssemblyVersion>
-    <FileVersion>1.3.26.0</FileVersion>
-    <Version>1.3.26.0</Version>
+    <AssemblyVersion>1.3.26.1</AssemblyVersion>
+    <FileVersion>1.3.26.1</FileVersion>
+    <Version>1.3.26.1</Version>
 	<Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.Factory/Implem.Factory.csproj b/Implem.Factory/Implem.Factory.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2022</Copyright>
-    <AssemblyVersion>1.3.26.0</AssemblyVersion>
-    <FileVersion>1.3.26.0</FileVersion>
-    <Version>1.3.26.0</Version>
+    <AssemblyVersion>1.3.26.1</AssemblyVersion>
+    <FileVersion>1.3.26.1</FileVersion>
+    <Version>1.3.26.1</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.Libraries/Implem.Libraries.csproj b/Implem.Libraries/Implem.Libraries.csproj
@@ -3,16 +3,16 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2022</Copyright>
-    <AssemblyVersion>1.3.26.0</AssemblyVersion>
-    <FileVersion>1.3.26.0</FileVersion>
-    <Version>1.3.26.0</Version>
+    <AssemblyVersion>1.3.26.1</AssemblyVersion>
+    <FileVersion>1.3.26.1</FileVersion>
+    <Version>1.3.26.1</Version>
 	<Nullable>disable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="15.0.3" />
     <PackageReference Include="DocumentFormat.OpenXml" Version="2.17.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="System.Drawing.Common" Version="5.0.3" />
     <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />

diff --git a/Implem.ParameterAccessor/Implem.ParameterAccessor.csproj b/Implem.ParameterAccessor/Implem.ParameterAccessor.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2022</Copyright>
-    <AssemblyVersion>1.3.26.0</AssemblyVersion>
-    <FileVersion>1.3.26.0</FileVersion>
-    <Version>1.3.26.0</Version>
+    <AssemblyVersion>1.3.26.1</AssemblyVersion>
+    <FileVersion>1.3.26.1</FileVersion>
+    <Version>1.3.26.1</Version>
 	<Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_SetByApiImages_Body.txt b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_SetByApiImages_Body.txt
@@ -1,4 +1,4 @@
-public void SetPostedFiles(
+public void SetPostedFile(
     Microsoft.AspNetCore.Http.IFormFile file,
     string columnName,
     Shared._ImageApiModel image)

diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_SetByApi_ImageHash_Body.txt b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_SetByApi_ImageHash_Body.txt
@@ -5,7 +5,7 @@
     var file = new Microsoft.AspNetCore.Http.FormFile(stream, 0, bytes.Length, null, $"image{o.Value.Extension}");
     if (ss.ColumnHash.Get(o.Key).AllowImage == true)
     {
-        SetPostedFiles(
+        SetPostedFile(
             file: file,
             columnName: o.Key,
             image: o.Value);

diff --git a/Implem.Pleasanter/Implem.Pleasanter.csproj b/Implem.Pleasanter/Implem.Pleasanter.csproj
@@ -5,10 +5,10 @@
     <Copyright>Copyright © Implem Inc 2014 - 2022</Copyright>
     <Description>Business application platform</Description>
     <AssemblyName>Implem.Pleasanter</AssemblyName>
-    <AssemblyVersion>1.3.26.0</AssemblyVersion>
-    <FileVersion>1.3.26.0</FileVersion>
+    <AssemblyVersion>1.3.26.1</AssemblyVersion>
+    <FileVersion>1.3.26.1</FileVersion>
     <LangVersion>7.2</LangVersion>
-    <Version>1.3.26.0</Version>
+    <Version>1.3.26.1</Version>
     <Nullable>disable</Nullable>
 	<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
@@ -61,7 +61,7 @@
     <PackageReference Include="Microsoft.Web.Infrastructure" Version="2.0.0">
       <NoWarn>NU1701</NoWarn>
     </PackageReference>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="3.6.0" />
     <PackageReference Include="Sendgrid" Version="9.28.1" />
     <PackageReference Include="SendGrid.SmtpApi" Version="1.4.6" />

diff --git a/Implem.Pleasanter/Libraries/Settings/SiteSettings.cs b/Implem.Pleasanter/Libraries/Settings/SiteSettings.cs
@@ -5306,6 +5306,7 @@ public List<string> ReplaceFieldColumns(
                 .Where(o => o.UseSearch == true)
                 .Select(o => o.ColumnName));
             columns.AddRange(StatusControls?
+                .Where(statusControl => statusControl.ColumnHash != null)
                 .SelectMany(statusControl => statusControl.ColumnHash)
                 .Where(o => o.Value != StatusControl.ControlConstraintsTypes.None)
                 .Select(o => o.Key));

diff --git a/Implem.Pleasanter/Libraries/SitePackages/Utilities.cs b/Implem.Pleasanter/Libraries/SitePackages/Utilities.cs
@@ -339,33 +339,37 @@ public static string ImportSitePackage(
                                 continue;
                             }
                         }
-                        var idConverter = new IdConverter(
-                            context: context,
-                            siteId: packageSiteModel.SavedSiteId,
-                            permissionShortModel: permissionShortModel,
-                            permissionIdList: sitePackage.PermissionIdList,
-                            convertSiteId: idHash[permissionShortModel.ReferenceId]);
-                        var exists = Rds.ExecuteScalar_int(
-                            context: context,
-                            statements: Rds.SelectPermissions(
-                                column: Rds.PermissionsColumn().ReferenceId(),
-                                where: Rds.PermissionsWhere()
-                                    .ReferenceId(idHash[permissionShortModel.ReferenceId])
-                                    .DeptId(idConverter.ConvertDeptId)
-                                    .GroupId(idConverter.ConvertGroupId)
-                                    .UserId(idConverter.ConvertUserId))) > 0;
-                        if (idConverter.Convert == true && !exists)
+                        var referenceId = idHash.Get(permissionShortModel.ReferenceId);
+                        if (referenceId > 0)
                         {
-                            Repository.ExecuteNonQuery(
+                            var idConverter = new IdConverter(
+                                context: context,
+                                siteId: packageSiteModel.SavedSiteId,
+                                permissionShortModel: permissionShortModel,
+                                permissionIdList: sitePackage.PermissionIdList,
+                                convertSiteId: referenceId);
+                            var exists = Rds.ExecuteScalar_int(
                                 context: context,
-                                transactional: true,
-                                statements: Rds.InsertPermissions(
-                                    param: Rds.PermissionsParam()
-                                        .ReferenceId(idHash[permissionShortModel.ReferenceId])
+                                statements: Rds.SelectPermissions(
+                                    column: Rds.PermissionsColumn().ReferenceId(),
+                                    where: Rds.PermissionsWhere()
+                                        .ReferenceId(referenceId)
                                         .DeptId(idConverter.ConvertDeptId)
                                         .GroupId(idConverter.ConvertGroupId)
-                                        .UserId(idConverter.ConvertUserId)
-                                        .PermissionType(permissionShortModel.PermissionType)));
+                                        .UserId(idConverter.ConvertUserId))) > 0;
+                            if (idConverter.Convert == true && !exists)
+                            {
+                                Repository.ExecuteNonQuery(
+                                    context: context,
+                                    transactional: true,
+                                    statements: Rds.InsertPermissions(
+                                        param: Rds.PermissionsParam()
+                                            .ReferenceId(referenceId)
+                                            .DeptId(idConverter.ConvertDeptId)
+                                            .GroupId(idConverter.ConvertGroupId)
+                                            .UserId(idConverter.ConvertUserId)
+                                            .PermissionType(permissionShortModel.PermissionType)));
+                            }
                         }
                     }
                 }

diff --git a/Implem.Pleasanter/Models/Issues/IssueModel.cs b/Implem.Pleasanter/Models/Issues/IssueModel.cs
@@ -3045,7 +3045,7 @@ public void SetByApi(Context context, SiteSettings ss)
                 var file = new Microsoft.AspNetCore.Http.FormFile(stream, 0, bytes.Length, null, $"image{o.Value.Extension}");
                 if (ss.ColumnHash.Get(o.Key).AllowImage == true)
                 {
-                    SetPostedFiles(
+                    SetPostedFile(
                         file: file,
                         columnName: o.Key,
                         image: o.Value);
@@ -3061,7 +3061,7 @@ public void SetByApi(Context context, SiteSettings ss)
             SetChoiceHash(context: context, ss: ss);
         }
 
-        public void SetPostedFiles(
+        public void SetPostedFile(
             Microsoft.AspNetCore.Http.IFormFile file,
             string columnName,
             Shared._ImageApiModel image)

diff --git a/Implem.Pleasanter/Models/Results/ResultModel.cs b/Implem.Pleasanter/Models/Results/ResultModel.cs
@@ -2743,7 +2743,7 @@ public void SetByApi(Context context, SiteSettings ss)
                 var file = new Microsoft.AspNetCore.Http.FormFile(stream, 0, bytes.Length, null, $"image{o.Value.Extension}");
                 if (ss.ColumnHash.Get(o.Key).AllowImage == true)
                 {
-                    SetPostedFiles(
+                    SetPostedFile(
                         file: file,
                         columnName: o.Key,
                         image: o.Value);
@@ -2759,7 +2759,7 @@ public void SetByApi(Context context, SiteSettings ss)
             SetChoiceHash(context: context, ss: ss);
         }
 
-        public void SetPostedFiles(
+        public void SetPostedFile(
             Microsoft.AspNetCore.Http.IFormFile file,
             string columnName,
             Shared._ImageApiModel image)

diff --git a/Implem.TestAutomation/implem.TestAutomation.csproj b/Implem.TestAutomation/implem.TestAutomation.csproj
@@ -4,9 +4,9 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2022</Copyright>
-    <AssemblyVersion>1.3.26.0</AssemblyVersion>
-    <FileVersion>1.3.26.0</FileVersion>
-    <Version>1.3.26.0</Version>
+    <AssemblyVersion>1.3.26.1</AssemblyVersion>
+    <FileVersion>1.3.26.1</FileVersion>
+    <Version>1.3.26.1</Version>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>  
   </PropertyGroup>
 
@@ -24,7 +24,7 @@
     <PackageReference Include="AspNetCoreCurrentRequestContext" Version="2.0.0" />
     <PackageReference Include="CsvHelper" Version="27.1.1" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="Selenium.Support" Version="4.4.0" />
     <PackageReference Include="Selenium.WebDriver" Version="4.4.0" />
     <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="106.0.5249.6100" />

diff --git a/Rds/Implem.IRds/Implem.IRds.csproj b/Rds/Implem.IRds/Implem.IRds.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2022</Copyright>
-    <AssemblyVersion>1.3.26.0</AssemblyVersion>
-    <FileVersion>1.3.26.0</FileVersion>
-    <Version>1.3.26.0</Version>
+    <AssemblyVersion>1.3.26.1</AssemblyVersion>
+    <FileVersion>1.3.26.1</FileVersion>
+    <Version>1.3.26.1</Version>
 	<Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Rds/Implem.PostgreSql/Implem.PostgreSql.csproj b/Rds/Implem.PostgreSql/Implem.PostgreSql.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2022</Copyright>
-    <AssemblyVersion>1.3.26.0</AssemblyVersion>
-    <FileVersion>1.3.26.0</FileVersion>
-    <Version>1.3.26.0</Version>
+    <AssemblyVersion>1.3.26.1</AssemblyVersion>
+    <FileVersion>1.3.26.1</FileVersion>
+    <Version>1.3.26.1</Version>
 	<Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Rds/Implem.SqlServer/Implem.SqlServer.csproj b/Rds/Implem.SqlServer/Implem.SqlServer.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2022</Copyright>
-    <AssemblyVersion>1.3.26.0</AssemblyVersion>
-    <FileVersion>1.3.26.0</FileVersion>
-    <Version>1.3.26.0</Version>
+    <AssemblyVersion>1.3.26.1</AssemblyVersion>
+    <FileVersion>1.3.26.1</FileVersion>
+    <Version>1.3.26.1</Version>
 	<Nullable>disable</Nullable>
   </PropertyGroup>