Skip to content

Commit

Permalink
Bug fixed:
Browse files Browse the repository at this point in the history
・親レコードから子レコードを作成する画面においてColumnFilterExpressionsを設定した検索ダイアログが正しく動作しない問題を解消。
・PostgreSQLの環境でSyncByLdapのAutoDisableが正しく動作しない問題を解消。
・レコード作成後のレスポンスJSONにおけるIDの出力順が意図せず仕様変更となった問題を解消。
  • Loading branch information
naop2610 committed Nov 4, 2022
1 parent 4b4ecf6 commit 65079a8
Show file tree
Hide file tree
Showing 25 changed files with 199 additions and 178 deletions.
6 changes: 3 additions & 3 deletions Implem.CodeDefiner/Implem.CodeDefiner.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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.25.1</AssemblyVersion>
<FileVersion>1.3.25.1</FileVersion>
<Version>1.3.25.1</Version>
<AssemblyVersion>1.3.25.2</AssemblyVersion>
<FileVersion>1.3.25.2</FileVersion>
<Version>1.3.25.2</Version>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2022</Copyright>
<AssemblyVersion>1.3.25.1</AssemblyVersion>
<FileVersion>1.3.25.1</FileVersion>
<Version>1.3.25.1</Version>
<AssemblyVersion>1.3.25.2</AssemblyVersion>
<FileVersion>1.3.25.2</FileVersion>
<Version>1.3.25.2</Version>
<Nullable>disable</Nullable>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions Implem.DisplayAccessor/Implem.DisplayAccessor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2022</Copyright>
<AssemblyVersion>1.3.25.1</AssemblyVersion>
<FileVersion>1.3.25.1</FileVersion>
<Version>1.3.25.1</Version>
<AssemblyVersion>1.3.25.2</AssemblyVersion>
<FileVersion>1.3.25.2</FileVersion>
<Version>1.3.25.2</Version>
<Nullable>disable</Nullable>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions Implem.Factory/Implem.Factory.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2022</Copyright>
<AssemblyVersion>1.3.25.1</AssemblyVersion>
<FileVersion>1.3.25.1</FileVersion>
<Version>1.3.25.1</Version>
<AssemblyVersion>1.3.25.2</AssemblyVersion>
<FileVersion>1.3.25.2</FileVersion>
<Version>1.3.25.2</Version>
<Nullable>disable</Nullable>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions Implem.Libraries/Implem.Libraries.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2022</Copyright>
<AssemblyVersion>1.3.25.1</AssemblyVersion>
<FileVersion>1.3.25.1</FileVersion>
<Version>1.3.25.1</Version>
<AssemblyVersion>1.3.25.2</AssemblyVersion>
<FileVersion>1.3.25.2</FileVersion>
<Version>1.3.25.2</Version>
<Nullable>disable</Nullable>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions Implem.ParameterAccessor/Implem.ParameterAccessor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Copyright>Copyright © Implem Inc 2014 - 2022</Copyright>
<AssemblyVersion>1.3.25.1</AssemblyVersion>
<FileVersion>1.3.25.1</FileVersion>
<Version>1.3.25.1</Version>
<AssemblyVersion>1.3.25.2</AssemblyVersion>
<FileVersion>1.3.25.2</FileVersion>
<Version>1.3.25.2</Version>
<Nullable>disable</Nullable>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var formsSiteId = context.Forms.Long("FromSiteId");
var formsSiteId = context.RequestData("FromSiteId").ToLong();
if (formsSiteId > 0)
{
var column = ss.GetColumn(
Expand All @@ -12,14 +12,14 @@ if (formsSiteId > 0)
context: context,
column: column);
column.Linking = column.MultipleSelections == true
? value.Deserialize<List<string>>()?.Contains(context.Forms.Data("LinkId")) == true
: value == context.Forms.Data("LinkId");
? value.Deserialize<List<string>>()?.Contains(context.RequestData("LinkId")) == true
: value == context.RequestData("LinkId");
}
}
var queryStringsSiteId = context.QueryStrings.Long("FromSiteId");
var queryStringsSiteId = context.RequestData("FromSiteId").ToLong();
if (queryStringsSiteId > 0)
{
var id = context.QueryStrings.Data("LinkId");
var id = context.RequestData("LinkId");
ss.Links
?.Where(link => link.SiteId == queryStringsSiteId)
.Select(link => ss.GetColumn(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,20 @@
ss: ss,
#modelName#Model: #modelName#Model,
process: processes?.FirstOrDefault()));
return new ResponseCollection(context: context)
.Response("id", #modelName#Model.#ModelName#Id.ToString())
.SetMemory("formChanged", false)
.Messages(context.Messages)
.Href(Locations.Edit(
context: context,
controller: context.Controller,
id: ss.Columns.Any(o => o.Linking)
? context.Forms.Long("LinkId")
: #modelName#Model.#ModelName#Id)
+ "?new=1"
+ (ss.Columns.Any(o => o.Linking)
&& context.Forms.Long("FromTabIndex") > 0
? $"&TabIndex={context.Forms.Long("FromTabIndex")}"
: string.Empty))
.ToJson();
return new ResponseCollection(
context: context,
id: #modelName#Model.#ModelName#Id)
.SetMemory("formChanged", false)
.Messages(context.Messages)
.Href(Locations.Edit(
context: context,
controller: context.Controller,
id: ss.Columns.Any(o => o.Linking)
? context.Forms.Long("LinkId")
: #modelName#Model.#ModelName#Id)
+ "?new=1"
+ (ss.Columns.Any(o => o.Linking)
&& context.Forms.Long("FromTabIndex") > 0
? $"&TabIndex={context.Forms.Long("FromTabIndex")}"
: string.Empty))
.ToJson();
6 changes: 3 additions & 3 deletions Implem.Pleasanter/Implem.Pleasanter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<Copyright>Copyright © Implem Inc 2014 - 2022</Copyright>
<Description>Business application platform</Description>
<AssemblyName>Implem.Pleasanter</AssemblyName>
<AssemblyVersion>1.3.25.1</AssemblyVersion>
<FileVersion>1.3.25.1</FileVersion>
<AssemblyVersion>1.3.25.2</AssemblyVersion>
<FileVersion>1.3.25.2</FileVersion>
<LangVersion>7.2</LangVersion>
<Version>1.3.25.1</Version>
<Version>1.3.25.2</Version>
<Nullable>disable</Nullable>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
Expand Down
10 changes: 9 additions & 1 deletion Implem.Pleasanter/Libraries/DataSources/LdapDs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,15 @@ private static void UpdateOrInsert(

public static void Sync(Context context)
{
var synchronizedTime = DateTime.Now;
var now = DateTime.Now;
var synchronizedTime = new DateTime(
year: now.Year,
month: now.Month,
day: now.Day,
hour: now.Hour,
minute: now.Minute,
second: now.Second,
millisecond: now.Millisecond);
Parameters.Authentication.LdapParameters
.ForEach(ldap => ldap.LdapSyncPatterns?
.ForEach(pattern =>
Expand Down
6 changes: 5 additions & 1 deletion Implem.Pleasanter/Libraries/Responses/ResponseCollection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,12 @@ public ResponseCollection()
{
}

public ResponseCollection(Context context)
public ResponseCollection(Context context, long id = 0)
{
if (id > 0)
{
Response("id", id.ToString());
}
if (context != null)
{
Log(context.GetLog());
Expand Down
33 changes: 17 additions & 16 deletions Implem.Pleasanter/Models/Depts/DeptUtilities.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1510,22 +1510,23 @@ public static string Create(Context context, SiteSettings ss)
ss: ss,
deptModel: deptModel,
process: processes?.FirstOrDefault()));
return new ResponseCollection(context: context)
.Response("id", deptModel.DeptId.ToString())
.SetMemory("formChanged", false)
.Messages(context.Messages)
.Href(Locations.Edit(
context: context,
controller: context.Controller,
id: ss.Columns.Any(o => o.Linking)
? context.Forms.Long("LinkId")
: deptModel.DeptId)
+ "?new=1"
+ (ss.Columns.Any(o => o.Linking)
&& context.Forms.Long("FromTabIndex") > 0
? $"&TabIndex={context.Forms.Long("FromTabIndex")}"
: string.Empty))
.ToJson();
return new ResponseCollection(
context: context,
id: deptModel.DeptId)
.SetMemory("formChanged", false)
.Messages(context.Messages)
.Href(Locations.Edit(
context: context,
controller: context.Controller,
id: ss.Columns.Any(o => o.Linking)
? context.Forms.Long("LinkId")
: deptModel.DeptId)
+ "?new=1"
+ (ss.Columns.Any(o => o.Linking)
&& context.Forms.Long("FromTabIndex") > 0
? $"&TabIndex={context.Forms.Long("FromTabIndex")}"
: string.Empty))
.ToJson();
default:
return errorData.MessageJson(context: context);
}
Expand Down
33 changes: 17 additions & 16 deletions Implem.Pleasanter/Models/Groups/GroupUtilities.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1502,22 +1502,23 @@ public static string Create(Context context, SiteSettings ss)
ss: ss,
groupModel: groupModel,
process: processes?.FirstOrDefault()));
return new ResponseCollection(context: context)
.Response("id", groupModel.GroupId.ToString())
.SetMemory("formChanged", false)
.Messages(context.Messages)
.Href(Locations.Edit(
context: context,
controller: context.Controller,
id: ss.Columns.Any(o => o.Linking)
? context.Forms.Long("LinkId")
: groupModel.GroupId)
+ "?new=1"
+ (ss.Columns.Any(o => o.Linking)
&& context.Forms.Long("FromTabIndex") > 0
? $"&TabIndex={context.Forms.Long("FromTabIndex")}"
: string.Empty))
.ToJson();
return new ResponseCollection(
context: context,
id: groupModel.GroupId)
.SetMemory("formChanged", false)
.Messages(context.Messages)
.Href(Locations.Edit(
context: context,
controller: context.Controller,
id: ss.Columns.Any(o => o.Linking)
? context.Forms.Long("LinkId")
: groupModel.GroupId)
+ "?new=1"
+ (ss.Columns.Any(o => o.Linking)
&& context.Forms.Long("FromTabIndex") > 0
? $"&TabIndex={context.Forms.Long("FromTabIndex")}"
: string.Empty))
.ToJson();
default:
return errorData.MessageJson(context: context);
}
Expand Down
10 changes: 5 additions & 5 deletions Implem.Pleasanter/Models/Issues/IssueModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2680,7 +2680,7 @@ public void SetByForm(
{
Ver = context.QueryStrings.Int("ver");
}
var formsSiteId = context.Forms.Long("FromSiteId");
var formsSiteId = context.RequestData("FromSiteId").ToLong();
if (formsSiteId > 0)
{
var column = ss.GetColumn(
Expand All @@ -2694,14 +2694,14 @@ public void SetByForm(
context: context,
column: column);
column.Linking = column.MultipleSelections == true
? value.Deserialize<List<string>>()?.Contains(context.Forms.Data("LinkId")) == true
: value == context.Forms.Data("LinkId");
? value.Deserialize<List<string>>()?.Contains(context.RequestData("LinkId")) == true
: value == context.RequestData("LinkId");
}
}
var queryStringsSiteId = context.QueryStrings.Long("FromSiteId");
var queryStringsSiteId = context.RequestData("FromSiteId").ToLong();
if (queryStringsSiteId > 0)
{
var id = context.QueryStrings.Data("LinkId");
var id = context.RequestData("LinkId");
ss.Links
?.Where(link => link.SiteId == queryStringsSiteId)
.Select(link => ss.GetColumn(
Expand Down
33 changes: 17 additions & 16 deletions Implem.Pleasanter/Models/Issues/IssueUtilities.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3094,22 +3094,23 @@ public static string Create(Context context, SiteSettings ss)
ss: ss,
issueModel: issueModel,
process: processes?.FirstOrDefault()));
return new ResponseCollection(context: context)
.Response("id", issueModel.IssueId.ToString())
.SetMemory("formChanged", false)
.Messages(context.Messages)
.Href(Locations.Edit(
context: context,
controller: context.Controller,
id: ss.Columns.Any(o => o.Linking)
? context.Forms.Long("LinkId")
: issueModel.IssueId)
+ "?new=1"
+ (ss.Columns.Any(o => o.Linking)
&& context.Forms.Long("FromTabIndex") > 0
? $"&TabIndex={context.Forms.Long("FromTabIndex")}"
: string.Empty))
.ToJson();
return new ResponseCollection(
context: context,
id: issueModel.IssueId)
.SetMemory("formChanged", false)
.Messages(context.Messages)
.Href(Locations.Edit(
context: context,
controller: context.Controller,
id: ss.Columns.Any(o => o.Linking)
? context.Forms.Long("LinkId")
: issueModel.IssueId)
+ "?new=1"
+ (ss.Columns.Any(o => o.Linking)
&& context.Forms.Long("FromTabIndex") > 0
? $"&TabIndex={context.Forms.Long("FromTabIndex")}"
: string.Empty))
.ToJson();
case Error.Types.Duplicated:
var duplicatedColumn = ss.GetColumn(
context: context,
Expand Down
10 changes: 5 additions & 5 deletions Implem.Pleasanter/Models/Results/ResultModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2411,7 +2411,7 @@ public void SetByForm(
{
Ver = context.QueryStrings.Int("ver");
}
var formsSiteId = context.Forms.Long("FromSiteId");
var formsSiteId = context.RequestData("FromSiteId").ToLong();
if (formsSiteId > 0)
{
var column = ss.GetColumn(
Expand All @@ -2425,14 +2425,14 @@ public void SetByForm(
context: context,
column: column);
column.Linking = column.MultipleSelections == true
? value.Deserialize<List<string>>()?.Contains(context.Forms.Data("LinkId")) == true
: value == context.Forms.Data("LinkId");
? value.Deserialize<List<string>>()?.Contains(context.RequestData("LinkId")) == true
: value == context.RequestData("LinkId");
}
}
var queryStringsSiteId = context.QueryStrings.Long("FromSiteId");
var queryStringsSiteId = context.RequestData("FromSiteId").ToLong();
if (queryStringsSiteId > 0)
{
var id = context.QueryStrings.Data("LinkId");
var id = context.RequestData("LinkId");
ss.Links
?.Where(link => link.SiteId == queryStringsSiteId)
.Select(link => ss.GetColumn(
Expand Down
Loading

0 comments on commit 65079a8

Please sign in to comment.