diff --git a/Implem.CodeDefiner/Implem.CodeDefiner.csproj b/Implem.CodeDefiner/Implem.CodeDefiner.csproj index dc6dc4978..5c884d629 100644 --- a/Implem.CodeDefiner/Implem.CodeDefiner.csproj +++ b/Implem.CodeDefiner/Implem.CodeDefiner.csproj @@ -5,9 +5,9 @@ net8.0 Copyright © Implem Inc 2014 - 2024 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.4.10.2 - 1.4.10.2 - 1.4.10.2 + 1.4.10.3 + 1.4.10.3 + 1.4.10.3 Linux diff --git a/Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj b/Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj index c35dcec34..4615e0bf3 100644 --- a/Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj +++ b/Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj @@ -3,9 +3,9 @@ net8.0 Copyright © Implem Inc 2014 - 2024 - 1.4.10.2 - 1.4.10.2 - 1.4.10.2 + 1.4.10.3 + 1.4.10.3 + 1.4.10.3 disable diff --git a/Implem.DisplayAccessor/Implem.DisplayAccessor.csproj b/Implem.DisplayAccessor/Implem.DisplayAccessor.csproj index 799a15282..9bb257f1c 100644 --- a/Implem.DisplayAccessor/Implem.DisplayAccessor.csproj +++ b/Implem.DisplayAccessor/Implem.DisplayAccessor.csproj @@ -3,9 +3,9 @@ net8.0 Copyright © Implem Inc 2014 - 2024 - 1.4.10.2 - 1.4.10.2 - 1.4.10.2 + 1.4.10.3 + 1.4.10.3 + 1.4.10.3 disable diff --git a/Implem.Factory/Implem.Factory.csproj b/Implem.Factory/Implem.Factory.csproj index 184b7e418..f5cb10fc0 100644 --- a/Implem.Factory/Implem.Factory.csproj +++ b/Implem.Factory/Implem.Factory.csproj @@ -3,9 +3,9 @@ net8.0 Copyright © Implem Inc 2014 - 2024 - 1.4.10.2 - 1.4.10.2 - 1.4.10.2 + 1.4.10.3 + 1.4.10.3 + 1.4.10.3 disable diff --git a/Implem.Libraries/Implem.Libraries.csproj b/Implem.Libraries/Implem.Libraries.csproj index 805db67df..57eeaf9af 100644 --- a/Implem.Libraries/Implem.Libraries.csproj +++ b/Implem.Libraries/Implem.Libraries.csproj @@ -3,9 +3,9 @@ net8.0 Copyright © Implem Inc 2014 - 2024 - 1.4.10.2 - 1.4.10.2 - 1.4.10.2 + 1.4.10.3 + 1.4.10.3 + 1.4.10.3 disable diff --git a/Implem.ParameterAccessor/Implem.ParameterAccessor.csproj b/Implem.ParameterAccessor/Implem.ParameterAccessor.csproj index 1ca18bf80..2ef5145f5 100644 --- a/Implem.ParameterAccessor/Implem.ParameterAccessor.csproj +++ b/Implem.ParameterAccessor/Implem.ParameterAccessor.csproj @@ -3,9 +3,9 @@ net8.0 Copyright © Implem Inc 2014 - 2024 - 1.4.10.2 - 1.4.10.2 - 1.4.10.2 + 1.4.10.3 + 1.4.10.3 + 1.4.10.3 disable diff --git a/Implem.Pleasanter.sln b/Implem.Pleasanter.sln index d1af8ced9..8836cddff 100644 --- a/Implem.Pleasanter.sln +++ b/Implem.Pleasanter.sln @@ -18,6 +18,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C3803F6D-E5AE-44CC-AE9F-C907441572A4}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig + global.json = global.json LICENSE = LICENSE README.md = README.md README_Pleasanter.md = README_Pleasanter.md diff --git a/Implem.Pleasanter/Implem.Pleasanter.csproj b/Implem.Pleasanter/Implem.Pleasanter.csproj index 757d628fa..518d6c047 100644 --- a/Implem.Pleasanter/Implem.Pleasanter.csproj +++ b/Implem.Pleasanter/Implem.Pleasanter.csproj @@ -5,9 +5,9 @@ Copyright © Implem Inc 2014 - 2024 Business application platform Implem.Pleasanter - 1.4.10.2 - 1.4.10.2 - 1.4.10.2 + 1.4.10.3 + 1.4.10.3 + 1.4.10.3 disable Linux ..\docker-compose.dcproj @@ -77,6 +77,10 @@ + + + + diff --git a/Implem.Pleasanter/wwwroot/scripts/_form.js b/Implem.Pleasanter/wwwroot/scripts/_form.js index bc84e3e12..21ff24a08 100644 --- a/Implem.Pleasanter/wwwroot/scripts/_form.js +++ b/Implem.Pleasanter/wwwroot/scripts/_form.js @@ -65,11 +65,11 @@ $p.send = function ($control, formId, _async, clearMessage) { var url = action !== undefined ? $form.attr('action').replace('_action_', action.toLowerCase()) : location.href; - url += $p.isAuthenticationByMail(); + url = $p.addAuthenticationByMailParameter(url); var fieldSetTab = $('li[role="tab"][aria-selected=true][aria-controls^=FieldSetTab]'); var selectedTabIndex = fieldSetTab.parent().children().index(fieldSetTab); if (selectedTabIndex > 0) { - url += ((url + '').indexOf('?') > -1 ? '&' : '?') + "TabIndex=" + selectedTabIndex; + url = $p.addUrlParameter(url, 'TabIndex', selectedTabIndex); } _async = _async !== undefined ? _async : true; if (methodType !== 'get') { @@ -114,6 +114,10 @@ $p.setFormChanged = function ($control) { } } +$p.addUrlParameter = function (url, key, value) { + return url + ((url + '').indexOf('?') > -1 ? '&' : '?') + key + "=" + value; +} + $p.throttle = (function () { var lastTime = 0; return function (action, interval) { diff --git a/Implem.Pleasanter/wwwroot/scripts/authenticatebymail.js b/Implem.Pleasanter/wwwroot/scripts/authenticatebymail.js index 12da46eaf..9418c2d27 100644 --- a/Implem.Pleasanter/wwwroot/scripts/authenticatebymail.js +++ b/Implem.Pleasanter/wwwroot/scripts/authenticatebymail.js @@ -9,10 +9,10 @@ }); } -$p.isAuthenticationByMail = function () { +$p.addAuthenticationByMailParameter = function (url) { if ($('#AuthenticationByMail').length) { - return '&isAuthenticationByMail=' + $('#AuthenticationByMail').data('isauthenticationbymail'); + return $p.addUrlParameter(url, 'isAuthenticationByMail', $('#AuthenticationByMail').data('isauthenticationbymail')); } else { - return ''; + return url; } } \ No newline at end of file diff --git a/Implem.TestAutomation/implem.TestAutomation.csproj b/Implem.TestAutomation/implem.TestAutomation.csproj index 4d8e1b008..5d0890664 100644 --- a/Implem.TestAutomation/implem.TestAutomation.csproj +++ b/Implem.TestAutomation/implem.TestAutomation.csproj @@ -4,9 +4,9 @@ Exe net8.0 Copyright © Implem Inc 2014 - 2024 - 1.4.10.2 - 1.4.10.2 - 1.4.10.2 + 1.4.10.3 + 1.4.10.3 + 1.4.10.3 Linux @@ -32,6 +32,10 @@ + + + + diff --git a/Rds/Implem.IRds/Implem.IRds.csproj b/Rds/Implem.IRds/Implem.IRds.csproj index 799a15282..9bb257f1c 100644 --- a/Rds/Implem.IRds/Implem.IRds.csproj +++ b/Rds/Implem.IRds/Implem.IRds.csproj @@ -3,9 +3,9 @@ net8.0 Copyright © Implem Inc 2014 - 2024 - 1.4.10.2 - 1.4.10.2 - 1.4.10.2 + 1.4.10.3 + 1.4.10.3 + 1.4.10.3 disable diff --git a/Rds/Implem.MySql/Implem.MySql.csproj b/Rds/Implem.MySql/Implem.MySql.csproj index 94d3066a2..67f856a46 100644 --- a/Rds/Implem.MySql/Implem.MySql.csproj +++ b/Rds/Implem.MySql/Implem.MySql.csproj @@ -3,9 +3,9 @@ net8.0 Copyright © Implem Inc 2014 - 2024 - 1.4.10.2 - 1.4.10.2 - 1.4.10.2 + 1.4.10.3 + 1.4.10.3 + 1.4.10.3 disable diff --git a/Rds/Implem.PostgreSql/Implem.PostgreSql.csproj b/Rds/Implem.PostgreSql/Implem.PostgreSql.csproj index 433b0108e..2f063bae5 100644 --- a/Rds/Implem.PostgreSql/Implem.PostgreSql.csproj +++ b/Rds/Implem.PostgreSql/Implem.PostgreSql.csproj @@ -3,9 +3,9 @@ net8.0 Copyright © Implem Inc 2014 - 2024 - 1.4.10.2 - 1.4.10.2 - 1.4.10.2 + 1.4.10.3 + 1.4.10.3 + 1.4.10.3 disable diff --git a/Rds/Implem.SqlServer/Implem.SqlServer.csproj b/Rds/Implem.SqlServer/Implem.SqlServer.csproj index 2404d5207..d30ad0973 100644 --- a/Rds/Implem.SqlServer/Implem.SqlServer.csproj +++ b/Rds/Implem.SqlServer/Implem.SqlServer.csproj @@ -3,9 +3,9 @@ net8.0 Copyright © Implem Inc 2014 - 2024 - 1.4.10.2 - 1.4.10.2 - 1.4.10.2 + 1.4.10.3 + 1.4.10.3 + 1.4.10.3 disable