#27297 include in 23.10.24 LTS

dotCMS · Jul 30, 2024 · f18aa87 · f18aa87
1 parent da2c232
commit f18aa87
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 16 deletions.
diff --git a/.../apps/dotcms-ui/src/app/portlets/dot-edit-page/content/dot-edit-content.component.spec.ts b/.../apps/dotcms-ui/src/app/portlets/dot-edit-page/content/dot-edit-content.component.spec.ts
@@ -1272,11 +1272,11 @@ describe('DotEditContentComponent', () => {
                         });
 
                         spyOn(dotContentletEditorService, 'getActionUrl').and.returnValue(
-                            of('/url/')
+                            of('/url/test?_content_lang=23&test=random')
                         );
                         spyOn(dotContentletEditorService, 'create').and.callFake((param) => {
                             expect(param.data).toEqual({
-                                url: '/url/'
+                                url: '/url/test?_content_lang=1&test=random'
                             });
 
                             const event: any = {

diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/dot-edit-content.component.ts b/core-web/apps/dotcms-ui/src/app/portlets/dot-edit-page/content/dot-edit-content.component.ts
@@ -411,6 +411,7 @@ browse from the page internal links
                 .getActionUrl($event.data.contentType.variable)
                 .pipe(take(1))
                 .subscribe((url) => {
+                    url = this.setCurrentContentLang(url);
                     this.dotContentletEditorService.create({
                         data: { url },
                         events: {
@@ -675,4 +676,18 @@ browse from the page internal links
             this.pageLanguageId = params['language_id'];
         });
     }
+
+    /**
+     * Sets the language parameter in the given URL and returns the concatenated pathname and search.
+     * the input URL doesn't include the host, origin is used as the base URL.
+     *
+     * @param {string} url - The input URL ( include pathname and search parameters).
+     * @returns {string} - The concatenated pathname and search parameters with the language parameter set.
+     */
+    private setCurrentContentLang(url: string): string {
+        const newUrl = new URL(url, window.location.origin);
+        newUrl.searchParams.set('_content_lang', this.pageLanguageId);
+
+        return newUrl.pathname + newUrl.search;
+    }
 }
diff --git a/dotCMS/hotfix_tracking.md b/dotCMS/hotfix_tracking.md
@@ -132,4 +132,5 @@ This maintenance release includes the following code fixes:
 125. https://github.com/dotCMS/core/issues/28509 : Remove three dots at the end of the Bundle ID #28509
 126. https://github.com/dotCMS/core/issues/28201 : AI Content Block inserts rich content as a single paragraph #28201
 127. https://github.com/dotCMS/core/issues/26987 : Set Response Headers Rule Action does not allow double quotes in the value #26987
-128. https://github.com/dotCMS/core/issues/26477 : Search filter can't find/filter images #26477
+128. https://github.com/dotCMS/core/issues/26477 : Search filter can't find/filter images #26477
+129. https://github.com/dotCMS/core/issues/27297 : Edit Page: Edit Contentlet Dialog Language Support #27297
diff --git a/dotCMS/src/main/webapp/html/js/dotcms/dijit/form/ContentSelector.js b/dotCMS/src/main/webapp/html/js/dotcms/dijit/form/ContentSelector.js
@@ -260,14 +260,26 @@ dojo.declare(
             if (dijit.byId('langcombo+' + this.dialogCounter)) {
                 dijit.byId('langcombo+' + this.dialogCounter).destroy();
             }
+            let selectedLang = null;
+            let options = ''
             this.availableLanguages = data;
+
+            for (var i = 0; i < data.length; i++) {
+                options += "<option  value='" + data[i].id + "'";
+                if (this.contentletLanguageId == data[i].id || this.languageId == data[i].id ) {
+                    options += " selected='true' ";
+                    selectedLang = data[i];
+                }
+                options +=
+                    '>' + this._getCountryLabel(data[i]) + '</option>';
+            }
             this.search_languages_table.innerHTML = '';
             var htmlstr = "<dl class='vertical'>";
             htmlstr +=
                 "<dt><label for='langcombo+" +
                 this.dialogCounter +
                 "'>" +
-                data[0].title +
+                selectedLang ? selectedLang.title : data[0].title +
                 '</label></dt>';
             htmlstr += '<dd>';
             dojo.require('dijit.form.FilteringSelect');
@@ -278,23 +290,19 @@ dojo.declare(
                 this.dialogCounter +
                 "'>";
 
-            for (var i = 0; i < data.length; i++) {
-                htmlstr += "<option  value='" + data[i].id + "'";
-                if (this.contentletLanguageId == data[i].id) {
-                    htmlstr += " selected='true' ";
-                }
-                htmlstr +=
-                    '>' +
-                    data[i].language +
-                    (data[i].country == '' ? '' : ' - ' + data[i].country) +
-                    '</option>';
-            }
-
+            htmlstr += options;
             htmlstr += '</select>';
             htmlstr += '</dd>';
             htmlstr += '</dl>';
             dojo.place(htmlstr, this.search_languages_table);
             dojo.parser.parse(this.search_languages_table);
+
+            let obj = dijit.byId('langcombo+' + this.dialogCounter);
+
+            // Set the displayed value
+            if (selectedLang) {
+                obj.set('displayedValue', this._getCountryLabel(selectedLang));
+            }
         },
 
         _getSiteFolderFieldDefaultHTML: function (){
@@ -1556,6 +1564,10 @@ dojo.declare(
             return iconCode.substring(startIndex, endIndex);
         },
 
+        _getCountryLabel: function (data) {
+            return  data.language + (data.country === '' ? '' : ' - ' + data.country)
+        },
+
         _replaceWithIcon: function (parentElement, iconName) {
             parentElement.innerHTML =
                 '<span class="' +

diff --git a/dotCMS/src/main/webapp/html/ng-contentlet-selector.jsp b/dotCMS/src/main/webapp/html/ng-contentlet-selector.jsp
@@ -26,6 +26,7 @@
 
 <%
     String containerIdentifier = request.getParameter("container_id");
+    String language_id = request.getParameter("language_id");
     User user = PortalUtil.getUser(request);
     Container container = null;
     if (FileAssetContainerUtil.getInstance().isFolderAssetContainerId(containerIdentifier)) {
@@ -227,6 +228,7 @@
 <div jsId="contentSelector"
      containerStructures='<%=containerStructures%>'
      onContentSelected="contentSelected"
+     languageId="<%=language_id%>"
      selectButtonLabel='<%= LanguageUtil.get(pageContext, "content.search.select") %>'
      dojoType="dotcms.dijit.form.ContentSelector">