diff --git a/Implem.CodeDefiner/Implem.CodeDefiner.csproj b/Implem.CodeDefiner/Implem.CodeDefiner.csproj index b731a69df..0a39c9388 100644 --- a/Implem.CodeDefiner/Implem.CodeDefiner.csproj +++ b/Implem.CodeDefiner/Implem.CodeDefiner.csproj @@ -5,9 +5,9 @@ net6.0 Copyright © Implem Inc 2014 - 2022 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. - 1.3.25.1 - 1.3.25.1 - 1.3.25.1 + 1.3.25.2 + 1.3.25.2 + 1.3.25.2 Linux diff --git a/Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj b/Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj index a8d19b643..fce082491 100644 --- a/Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj +++ b/Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj @@ -3,9 +3,9 @@ net6.0 Copyright © Implem Inc 2014 - 2022 - 1.3.25.1 - 1.3.25.1 - 1.3.25.1 + 1.3.25.2 + 1.3.25.2 + 1.3.25.2 disable diff --git a/Implem.DisplayAccessor/Implem.DisplayAccessor.csproj b/Implem.DisplayAccessor/Implem.DisplayAccessor.csproj index f6ad8fda1..13c04e3e7 100644 --- a/Implem.DisplayAccessor/Implem.DisplayAccessor.csproj +++ b/Implem.DisplayAccessor/Implem.DisplayAccessor.csproj @@ -3,9 +3,9 @@ net6.0 Copyright © Implem Inc 2014 - 2022 - 1.3.25.1 - 1.3.25.1 - 1.3.25.1 + 1.3.25.2 + 1.3.25.2 + 1.3.25.2 disable diff --git a/Implem.Factory/Implem.Factory.csproj b/Implem.Factory/Implem.Factory.csproj index 4286c0673..2b4c74a0a 100644 --- a/Implem.Factory/Implem.Factory.csproj +++ b/Implem.Factory/Implem.Factory.csproj @@ -3,9 +3,9 @@ net6.0 Copyright © Implem Inc 2014 - 2022 - 1.3.25.1 - 1.3.25.1 - 1.3.25.1 + 1.3.25.2 + 1.3.25.2 + 1.3.25.2 disable diff --git a/Implem.Libraries/Implem.Libraries.csproj b/Implem.Libraries/Implem.Libraries.csproj index 3bb03557e..a933e3380 100644 --- a/Implem.Libraries/Implem.Libraries.csproj +++ b/Implem.Libraries/Implem.Libraries.csproj @@ -3,9 +3,9 @@ net6.0 Copyright © Implem Inc 2014 - 2022 - 1.3.25.1 - 1.3.25.1 - 1.3.25.1 + 1.3.25.2 + 1.3.25.2 + 1.3.25.2 disable diff --git a/Implem.ParameterAccessor/Implem.ParameterAccessor.csproj b/Implem.ParameterAccessor/Implem.ParameterAccessor.csproj index 54ceb7df5..0ca2f0009 100644 --- a/Implem.ParameterAccessor/Implem.ParameterAccessor.csproj +++ b/Implem.ParameterAccessor/Implem.ParameterAccessor.csproj @@ -3,9 +3,9 @@ net6.0 Copyright © Implem Inc 2014 - 2022 - 1.3.25.1 - 1.3.25.1 - 1.3.25.1 + 1.3.25.2 + 1.3.25.2 + 1.3.25.2 disable diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_SetLinking_Body.txt b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_SetLinking_Body.txt index 05f73319f..64d47cd2d 100644 --- a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_SetLinking_Body.txt +++ b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_SetLinking_Body.txt @@ -1,4 +1,4 @@ -var formsSiteId = context.Forms.Long("FromSiteId"); +var formsSiteId = context.RequestData("FromSiteId").ToLong(); if (formsSiteId > 0) { var column = ss.GetColumn( @@ -12,14 +12,14 @@ if (formsSiteId > 0) context: context, column: column); column.Linking = column.MultipleSelections == true - ? value.Deserialize>()?.Contains(context.Forms.Data("LinkId")) == true - : value == context.Forms.Data("LinkId"); + ? value.Deserialize>()?.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( diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_Utilities_CreatedResponse_Body.txt b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_Utilities_CreatedResponse_Body.txt index e94df6e55..6722a2201 100644 --- a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_Utilities_CreatedResponse_Body.txt +++ b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_Utilities_CreatedResponse_Body.txt @@ -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(); \ No newline at end of file +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(); \ No newline at end of file diff --git a/Implem.Pleasanter/Implem.Pleasanter.csproj b/Implem.Pleasanter/Implem.Pleasanter.csproj index eca8db10d..1b387eb4a 100644 --- a/Implem.Pleasanter/Implem.Pleasanter.csproj +++ b/Implem.Pleasanter/Implem.Pleasanter.csproj @@ -5,10 +5,10 @@ Copyright © Implem Inc 2014 - 2022 Business application platform Implem.Pleasanter - 1.3.25.1 - 1.3.25.1 + 1.3.25.2 + 1.3.25.2 7.2 - 1.3.25.1 + 1.3.25.2 disable Linux ..\docker-compose.dcproj diff --git a/Implem.Pleasanter/Libraries/DataSources/LdapDs.cs b/Implem.Pleasanter/Libraries/DataSources/LdapDs.cs index 7f39c0cd5..86c6def47 100644 --- a/Implem.Pleasanter/Libraries/DataSources/LdapDs.cs +++ b/Implem.Pleasanter/Libraries/DataSources/LdapDs.cs @@ -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 => diff --git a/Implem.Pleasanter/Libraries/Responses/ResponseCollection.cs b/Implem.Pleasanter/Libraries/Responses/ResponseCollection.cs index 376dee58d..8ea89726a 100644 --- a/Implem.Pleasanter/Libraries/Responses/ResponseCollection.cs +++ b/Implem.Pleasanter/Libraries/Responses/ResponseCollection.cs @@ -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()); diff --git a/Implem.Pleasanter/Models/Depts/DeptUtilities.cs b/Implem.Pleasanter/Models/Depts/DeptUtilities.cs index b4a54f835..7760c343e 100644 --- a/Implem.Pleasanter/Models/Depts/DeptUtilities.cs +++ b/Implem.Pleasanter/Models/Depts/DeptUtilities.cs @@ -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); } diff --git a/Implem.Pleasanter/Models/Groups/GroupUtilities.cs b/Implem.Pleasanter/Models/Groups/GroupUtilities.cs index a9be2b744..bc5677c27 100644 --- a/Implem.Pleasanter/Models/Groups/GroupUtilities.cs +++ b/Implem.Pleasanter/Models/Groups/GroupUtilities.cs @@ -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); } diff --git a/Implem.Pleasanter/Models/Issues/IssueModel.cs b/Implem.Pleasanter/Models/Issues/IssueModel.cs index 1aed4f10a..9d1cc7a2a 100644 --- a/Implem.Pleasanter/Models/Issues/IssueModel.cs +++ b/Implem.Pleasanter/Models/Issues/IssueModel.cs @@ -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( @@ -2694,14 +2694,14 @@ public void SetByForm( context: context, column: column); column.Linking = column.MultipleSelections == true - ? value.Deserialize>()?.Contains(context.Forms.Data("LinkId")) == true - : value == context.Forms.Data("LinkId"); + ? value.Deserialize>()?.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( diff --git a/Implem.Pleasanter/Models/Issues/IssueUtilities.cs b/Implem.Pleasanter/Models/Issues/IssueUtilities.cs index bdc47e35d..8fc47b86f 100644 --- a/Implem.Pleasanter/Models/Issues/IssueUtilities.cs +++ b/Implem.Pleasanter/Models/Issues/IssueUtilities.cs @@ -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, diff --git a/Implem.Pleasanter/Models/Results/ResultModel.cs b/Implem.Pleasanter/Models/Results/ResultModel.cs index d0b359cfd..8f441187c 100644 --- a/Implem.Pleasanter/Models/Results/ResultModel.cs +++ b/Implem.Pleasanter/Models/Results/ResultModel.cs @@ -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( @@ -2425,14 +2425,14 @@ public void SetByForm( context: context, column: column); column.Linking = column.MultipleSelections == true - ? value.Deserialize>()?.Contains(context.Forms.Data("LinkId")) == true - : value == context.Forms.Data("LinkId"); + ? value.Deserialize>()?.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( diff --git a/Implem.Pleasanter/Models/Results/ResultUtilities.cs b/Implem.Pleasanter/Models/Results/ResultUtilities.cs index 107015206..b8fbaa21a 100644 --- a/Implem.Pleasanter/Models/Results/ResultUtilities.cs +++ b/Implem.Pleasanter/Models/Results/ResultUtilities.cs @@ -2913,22 +2913,23 @@ public static string Create(Context context, SiteSettings ss) ss: ss, resultModel: resultModel, process: processes?.FirstOrDefault())); - return new ResponseCollection(context: context) - .Response("id", resultModel.ResultId.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") - : resultModel.ResultId) - + "?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: resultModel.ResultId) + .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") + : resultModel.ResultId) + + "?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, diff --git a/Implem.Pleasanter/Models/SysLogs/SysLogUtilities.cs b/Implem.Pleasanter/Models/SysLogs/SysLogUtilities.cs index af800b579..2f56c1a84 100644 --- a/Implem.Pleasanter/Models/SysLogs/SysLogUtilities.cs +++ b/Implem.Pleasanter/Models/SysLogs/SysLogUtilities.cs @@ -1983,22 +1983,23 @@ public static string Create(Context context, SiteSettings ss) ss: ss, sysLogModel: sysLogModel, process: processes?.FirstOrDefault())); - return new ResponseCollection(context: context) - .Response("id", sysLogModel.SysLogId.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") - : sysLogModel.SysLogId) - + "?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: sysLogModel.SysLogId) + .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") + : sysLogModel.SysLogId) + + "?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); } diff --git a/Implem.Pleasanter/Models/Tenants/TenantUtilities.cs b/Implem.Pleasanter/Models/Tenants/TenantUtilities.cs index f843b7dd0..23d05c42a 100644 --- a/Implem.Pleasanter/Models/Tenants/TenantUtilities.cs +++ b/Implem.Pleasanter/Models/Tenants/TenantUtilities.cs @@ -1155,22 +1155,23 @@ public static string Create(Context context, SiteSettings ss) ss: ss, tenantModel: tenantModel, process: processes?.FirstOrDefault())); - return new ResponseCollection(context: context) - .Response("id", tenantModel.TenantId.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") - : tenantModel.TenantId) - + "?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: tenantModel.TenantId) + .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") + : tenantModel.TenantId) + + "?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); } diff --git a/Implem.Pleasanter/Models/Users/UserUtilities.cs b/Implem.Pleasanter/Models/Users/UserUtilities.cs index c50ae0098..f1468e5dd 100644 --- a/Implem.Pleasanter/Models/Users/UserUtilities.cs +++ b/Implem.Pleasanter/Models/Users/UserUtilities.cs @@ -2483,22 +2483,23 @@ public static string Create(Context context, SiteSettings ss) ss: ss, userModel: userModel, process: processes?.FirstOrDefault())); - return new ResponseCollection(context: context) - .Response("id", userModel.UserId.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") - : userModel.UserId) - + "?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: userModel.UserId) + .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") + : userModel.UserId) + + "?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); } diff --git a/Implem.Pleasanter/wwwroot/scripts/dropdownsearch.js b/Implem.Pleasanter/wwwroot/scripts/dropdownsearch.js index edcf5878b..b7670a126 100644 --- a/Implem.Pleasanter/wwwroot/scripts/dropdownsearch.js +++ b/Implem.Pleasanter/wwwroot/scripts/dropdownsearch.js @@ -20,6 +20,7 @@ $p.openDropDownSearchDialog = function ($control) { if ($('#IsNew').val() === '1') { $p.data.MainForm.IsNew = '1'; } + $p.setMustData($('#MainForm')); $p.data.DropDownSearchDialogForm = $p.data.MainForm; var referenceId = $p.id(); var $tr = $control.closest('tr'); diff --git a/Implem.TestAutomation/implem.TestAutomation.csproj b/Implem.TestAutomation/implem.TestAutomation.csproj index 02c09daf3..3b89f7227 100644 --- a/Implem.TestAutomation/implem.TestAutomation.csproj +++ b/Implem.TestAutomation/implem.TestAutomation.csproj @@ -4,9 +4,9 @@ Exe net6.0 Copyright © Implem Inc 2014 - 2022 - 1.3.25.1 - 1.3.25.1 - 1.3.25.1 + 1.3.25.2 + 1.3.25.2 + 1.3.25.2 Linux diff --git a/Rds/Implem.IRds/Implem.IRds.csproj b/Rds/Implem.IRds/Implem.IRds.csproj index f6ad8fda1..13c04e3e7 100644 --- a/Rds/Implem.IRds/Implem.IRds.csproj +++ b/Rds/Implem.IRds/Implem.IRds.csproj @@ -3,9 +3,9 @@ net6.0 Copyright © Implem Inc 2014 - 2022 - 1.3.25.1 - 1.3.25.1 - 1.3.25.1 + 1.3.25.2 + 1.3.25.2 + 1.3.25.2 disable diff --git a/Rds/Implem.PostgreSql/Implem.PostgreSql.csproj b/Rds/Implem.PostgreSql/Implem.PostgreSql.csproj index 5807508c0..7c9dab193 100644 --- a/Rds/Implem.PostgreSql/Implem.PostgreSql.csproj +++ b/Rds/Implem.PostgreSql/Implem.PostgreSql.csproj @@ -3,9 +3,9 @@ net6.0 Copyright © Implem Inc 2014 - 2022 - 1.3.25.1 - 1.3.25.1 - 1.3.25.1 + 1.3.25.2 + 1.3.25.2 + 1.3.25.2 disable diff --git a/Rds/Implem.SqlServer/Implem.SqlServer.csproj b/Rds/Implem.SqlServer/Implem.SqlServer.csproj index 50acbf79d..fbf8ea3ac 100644 --- a/Rds/Implem.SqlServer/Implem.SqlServer.csproj +++ b/Rds/Implem.SqlServer/Implem.SqlServer.csproj @@ -3,9 +3,9 @@ net6.0 Copyright © Implem Inc 2014 - 2022 - 1.3.25.1 - 1.3.25.1 - 1.3.25.1 + 1.3.25.2 + 1.3.25.2 + 1.3.25.2 disable