## Bug fixed

・サイトパッケージインポート時に、サイトのリンクが解除される場合がある問題を解消。・削除したサイトを表示するゴミ箱の一覧で、サイトのタイトルが表示されない問題を解消。・ガイド機能でマークダウンを設定すると表示が崩れる問題を解消。・「アクセス権の継承」ドロップダウンリストの幅を調整。
Implem · Sep 17, 2024 · 198f655 · 198f655
1 parent 6281619
commit 198f655
Show file tree

Hide file tree

Showing 18 changed files with 76 additions and 51 deletions.
diff --git a/Implem.CodeDefiner/Implem.CodeDefiner.csproj b/Implem.CodeDefiner/Implem.CodeDefiner.csproj
@@ -5,9 +5,9 @@
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</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.4.8.0</AssemblyVersion>
-    <FileVersion>1.4.8.0</FileVersion>
-    <Version>1.4.8.0</Version>
+    <AssemblyVersion>1.4.8.1</AssemblyVersion>
+    <FileVersion>1.4.8.1</FileVersion>
+    <Version>1.4.8.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>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
-    <AssemblyVersion>1.4.8.0</AssemblyVersion>
-    <FileVersion>1.4.8.0</FileVersion>
-    <Version>1.4.8.0</Version>
+    <AssemblyVersion>1.4.8.1</AssemblyVersion>
+    <FileVersion>1.4.8.1</FileVersion>
+    <Version>1.4.8.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>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
-    <AssemblyVersion>1.4.8.0</AssemblyVersion>
-    <FileVersion>1.4.8.0</FileVersion>
-    <Version>1.4.8.0</Version>
+    <AssemblyVersion>1.4.8.1</AssemblyVersion>
+    <FileVersion>1.4.8.1</FileVersion>
+    <Version>1.4.8.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>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
-    <AssemblyVersion>1.4.8.0</AssemblyVersion>
-    <FileVersion>1.4.8.0</FileVersion>
-    <Version>1.4.8.0</Version>
+    <AssemblyVersion>1.4.8.1</AssemblyVersion>
+    <FileVersion>1.4.8.1</FileVersion>
+    <Version>1.4.8.1</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.Libraries/Implem.Libraries.csproj b/Implem.Libraries/Implem.Libraries.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
-    <AssemblyVersion>1.4.8.0</AssemblyVersion>
-    <FileVersion>1.4.8.0</FileVersion>
-    <Version>1.4.8.0</Version>
+    <AssemblyVersion>1.4.8.1</AssemblyVersion>
+    <FileVersion>1.4.8.1</FileVersion>
+    <Version>1.4.8.1</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.ParameterAccessor/Implem.ParameterAccessor.csproj b/Implem.ParameterAccessor/Implem.ParameterAccessor.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
-    <AssemblyVersion>1.4.8.0</AssemblyVersion>
-    <FileVersion>1.4.8.0</FileVersion>
-    <Version>1.4.8.0</Version>
+    <AssemblyVersion>1.4.8.1</AssemblyVersion>
+    <FileVersion>1.4.8.1</FileVersion>
+    <Version>1.4.8.1</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.Pleasanter/Implem.Pleasanter.csproj b/Implem.Pleasanter/Implem.Pleasanter.csproj
@@ -5,9 +5,9 @@
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
     <Description>Business application platform</Description>
     <AssemblyName>Implem.Pleasanter</AssemblyName>
-    <AssemblyVersion>1.4.8.0</AssemblyVersion>
-    <FileVersion>1.4.8.0</FileVersion>
-    <Version>1.4.8.0</Version>
+    <AssemblyVersion>1.4.8.1</AssemblyVersion>
+    <FileVersion>1.4.8.1</FileVersion>
+    <Version>1.4.8.1</Version>
     <Nullable>disable</Nullable>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>

diff --git a/Implem.Pleasanter/Libraries/DataTypes/Title.cs b/Implem.Pleasanter/Libraries/DataTypes/Title.cs
@@ -319,13 +319,10 @@ protected void TdTitle(
                 .Join("&");
             if (Id > 0
                 && column.SiteSettings?.TableType == Sqls.TableTypes.Normal
-                && column.SiteSettings?.GetNoDisplayIfReadOnly(context: context) != true)
+                && column.SiteSettings?.GetNoDisplayIfReadOnly(context: context) != true
+                && column.SiteSettings?.DisableLinkToEdit != true)
             {
-                if (column.SiteSettings?.DisableLinkToEdit == true)
-                {
-                    hb.Text(text: DisplayValue);
-                }
-                else if (column.SiteSettings?.OpenEditInNewTab == true)
+                if (column.SiteSettings?.OpenEditInNewTab == true)
                 {
                     hb.A(
                         href: Locations.ItemEdit(
@@ -349,6 +346,10 @@ protected void TdTitle(
                         text: DisplayValue);
                 }
             }
+            else
+            {
+                hb.Text(text: DisplayValue);
+            }
         }
 
         public virtual string GridText(Context context, Column column)

diff --git a/Implem.Pleasanter/Libraries/SitePackages/SitePackage.cs b/Implem.Pleasanter/Libraries/SitePackages/SitePackage.cs
@@ -318,7 +318,10 @@ public void ConvertDataId(Context context, Dictionary<long, long> idHash)
                             context: context,
                             statements: Rds.SelectItems(
                                 column: Rds.ItemsColumn().ReferenceType(),
-                                where: Rds.ItemsWhere().SiteId(link.SiteId)));
+                                where: Rds.ItemsWhere()
+                                    .SiteId(link.SiteId)
+                                    .ReferenceType("Sites", _operator: "!="),
+                                top: 1));
                         switch (destinationType)
                         {
                             case "Issues":

diff --git a/Implem.Pleasanter/Models/Permissions/PermissionUtilities.cs b/Implem.Pleasanter/Models/Permissions/PermissionUtilities.cs
@@ -163,7 +163,7 @@ public static HtmlBuilder Inherit(
                 ? hb.FieldDropDown(
                     context: context,
                     controlId: "InheritPermission",
-                    fieldCss: "field-auto-thin",
+                    fieldCss: "field-auto",
                     controlCss: " auto-postback search",
                     labelText: Displays.InheritPermission(context: context),
                     optionCollection: InheritTargets(

diff --git a/Implem.Pleasanter/wwwroot/content/styles.css b/Implem.Pleasanter/wwwroot/content/styles.css
@@ -325,6 +325,10 @@ pre {
     padding: 10px 5px 10px;
 }
 
+#Guide .markup{
+    overflow: hidden;
+}
+
 #CopyToClipboards > .display-control {
     float: left;
     cursor: pointer;
@@ -1890,6 +1894,7 @@ td > .field-normal, td > .field-wide {
 }
 
 .field-auto {
+    display: flex;
     width: auto;
     height: 45px;
     float: left;
@@ -1910,6 +1915,7 @@ td > .field-normal, td > .field-wide {
     .field-auto > .field-control {
         width: auto;
         float: left;
+        flex: 1;
     }
 
 .field-auto-thin {

diff --git a/Implem.Pleasanter/wwwroot/content/styles.min.css b/Implem.Pleasanter/wwwroot/content/styles.min.css
diff --git a/Implem.Pleasanter/wwwroot/styles/plugins/themes/themes.custom.css b/Implem.Pleasanter/wwwroot/styles/plugins/themes/themes.custom.css
@@ -398,6 +398,14 @@ html .ui-button.ui-state-disabled:active {
     }
 }
 
+/* dropdown */
+.control-dropdown{
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+
+}
+
 /* input-field */
 .control-textbox {
     position: relative;
@@ -608,14 +616,6 @@ html .ui-button.ui-state-disabled:active {
     */
 }
 
-/* field-auto-thin */
-.field-auto-thin {
-    .control-dropdown {
-        max-width: 500px;
-        width: auto;
-    }
-}
-
 .field-normal {
     height: 4em;
 }
@@ -1231,6 +1231,15 @@ body {
         .ui-icon {
             background-image: url("../images/ui-icons_3d3d3d_256x240.png");
         }
+        .md{
+            color: var(--guide-text);
+            p{
+                margin-bottom: 0;
+                +{
+                    margin-top: 10px;
+                }
+            }
+        }
     }
 }
 
@@ -1716,7 +1725,7 @@ body:not(:has(#Editor)){
     padding: 0 16px !important;
     .fieldset {
         margin: 0;
-        + .fieldset {
+        + .fieldset:not(.ui-tabs-panel) {
             margin-top: 16px;
         }
         &.enclosed-half {

diff --git a/Implem.Pleasanter/wwwroot/styles/site.css b/Implem.Pleasanter/wwwroot/styles/site.css
@@ -325,6 +325,10 @@ pre {
     padding: 10px 5px 10px;
 }
 
+#Guide .markup{
+    overflow: hidden;
+}
+
 #CopyToClipboards > .display-control {
     float: left;
     cursor: pointer;
@@ -1890,6 +1894,7 @@ td > .field-normal, td > .field-wide {
 }
 
 .field-auto {
+    display: flex;
     width: auto;
     height: 45px;
     float: left;
@@ -1910,6 +1915,7 @@ td > .field-normal, td > .field-wide {
     .field-auto > .field-control {
         width: auto;
         float: left;
+        flex: 1;
     }
 
 .field-auto-thin {

diff --git a/Implem.TestAutomation/implem.TestAutomation.csproj b/Implem.TestAutomation/implem.TestAutomation.csproj
@@ -4,9 +4,9 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
-    <AssemblyVersion>1.4.8.0</AssemblyVersion>
-    <FileVersion>1.4.8.0</FileVersion>
-    <Version>1.4.8.0</Version>
+    <AssemblyVersion>1.4.8.1</AssemblyVersion>
+    <FileVersion>1.4.8.1</FileVersion>
+    <Version>1.4.8.1</Version>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>  
   </PropertyGroup>
 

diff --git a/Rds/Implem.IRds/Implem.IRds.csproj b/Rds/Implem.IRds/Implem.IRds.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
-    <AssemblyVersion>1.4.6.2</AssemblyVersion>
-    <FileVersion>1.4.6.2</FileVersion>
-    <Version>1.4.6.2</Version>
+    <AssemblyVersion>1.4.8.1</AssemblyVersion>
+    <FileVersion>1.4.8.1</FileVersion>
+    <Version>1.4.8.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>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
-    <AssemblyVersion>1.4.6.2</AssemblyVersion>
-    <FileVersion>1.4.6.2</FileVersion>
-    <Version>1.4.6.2</Version>
+    <AssemblyVersion>1.4.8.1</AssemblyVersion>
+    <FileVersion>1.4.8.1</FileVersion>
+    <Version>1.4.8.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>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
-    <AssemblyVersion>1.4.6.2</AssemblyVersion>
-    <FileVersion>1.4.6.2</FileVersion>
-    <Version>1.4.6.2</Version>
+    <AssemblyVersion>1.4.8.1</AssemblyVersion>
+    <FileVersion>1.4.8.1</FileVersion>
+    <Version>1.4.8.1</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>