浏览代码

Merge branch 'feature/V8-5299' into develop

# Conflicts:
#	services/layout/menuBuilder/websiteListMenuBuilder.ts
#	tests/units/services/layout/menuBuilder/websiteListMenuBuilder.test.ts
Vincent 1 年之前
父节点
当前提交
ab62fb343a

+ 1 - 2
services/layout/menuBuilder/websiteListMenuBuilder.ts

@@ -19,12 +19,11 @@ export default class WebsiteListMenuBuilder extends AbstractMenuBuilder {
 
     // Add organization website
     if (this.organizationProfile.website) {
-      const url = UrlUtils.join(this.organizationProfile.website, '/typo3')
       children.push(
         this.createItem(
           this.organizationProfile.name as string,
           undefined,
-          url,
+          this.organizationProfile.website,
           MENU_LINK_TYPE.EXTERNAL,
         ),
       )

+ 11 - 11
tests/units/services/layout/menuBuilder/websiteListMenuBuilder.test.ts

@@ -48,16 +48,16 @@ describe('build', () => {
 
     const result = menuBuilder.build() as MenuGroup
 
-    expect(result.children).toEqual([
-      {
-        label: 'MyOrganization',
-        icon: undefined,
-        to: 'https://some-website.com/typo3',
-        type: MENU_LINK_TYPE.EXTERNAL,
-        active: false,
-      },
-    ])
-  })
+        expect(result.children).toEqual([
+            {
+                label: 'MyOrganization',
+                icon: undefined,
+                to: 'https://some-website.com',
+                type: MENU_LINK_TYPE.EXTERNAL,
+                active: false,
+            },
+        ])
+    })
 
   test('with parents but no website', () => {
     organizationProfile.name = 'MyOrganization'
@@ -112,7 +112,7 @@ describe('build', () => {
       {
         label: 'MyOrganization',
         icon: undefined,
-        to: 'https://some-website.com/typo3',
+        to: 'https://some-website.com',
         type: MENU_LINK_TYPE.EXTERNAL,
         active: false,
       },