chore: include hotfix-19263 (#26153)

dotCMS · Sep 18, 2023 · 19e8cb3 · 19e8cb3
1 parent 4d8b683
commit 19e8cb3
Showing 1 changed file with 9 additions and 7 deletions.
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
@@ -65,7 +65,7 @@ dojo.declare("dotcms.dijit.form.ContentSelector", [dijit._Widget, dijit._Templat
 	structureInode: '',
 	structureVelVar: '',
 	setDotFieldTypeStr: '',
-	currentSortBy: "",
+	currentSortBy: "score,modDate desc",
 	DOT_FIELD_TYPE: 'dotFieldType',
 	hasHostFolderField: false,
 	counter_radio: 0,
@@ -155,7 +155,7 @@ dojo.declare("dotcms.dijit.form.ContentSelector", [dijit._Widget, dijit._Templat
 	},
 
 	_structureChanged: function () {
-        this.currentSortBy = "";
+        this.currentSortBy = "score,modDate desc";
         this.setDotFieldTypeStr = "";
 		LanguageAjax.getLanguagesWithAllOption(dojo.hitch(this, this._fillLanguages));
 		StructureAjax.getSearchableStructureFields (this.structureInode,dojo.hitch(this, this._fillFields));
@@ -545,11 +545,13 @@ dojo.declare("dotcms.dijit.form.ContentSelector", [dijit._Widget, dijit._Templat
 //		else
 //		fieldsValues[fieldsValues.length] = this.languageId;
 
-		if(dijit.byId("langcombo+"+this.dialogCounter).get('displayedValue') != "")
-			fieldsValues[fieldsValues.length] = dijit.byId("langcombo+"+this.dialogCounter).get('value');
-		else
-            fieldsValues[fieldsValues.length] = "";
-
+		var langDropDownById = dijit.byId("langcombo+"+this.dialogCounter);
+		if (langDropDownById && langDropDownById.get('displayedValue') != "") {
+			fieldsValues[fieldsValues.length] = langDropDownById.get('value');
+		} else {
+			fieldsValues[fieldsValues.length] = "";
+		}
+
         var allField = this.generalSearch.value;
 
         if (allField != undefined && allField.length>0 ) {