Merge pull request #10980 from IQSS/7239-mydata-results-by-username

fixing filter for Results By Username
IQSS · Nov 21, 2024 · 88e4276 · 88e4276
2 parents 9edf1ea + 7a15950
commit 88e4276
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/doc/release-notes/7239-mydata-results-by-username.md b/doc/release-notes/7239-mydata-results-by-username.md
@@ -0,0 +1,3 @@
+## Fix My Data filter results by username for Administrators
+
+The filtering for the username on the MyData page was not working. This is only available for superusers. This fixes the "Results for Username" field to return the data for the desired user. See also #7239 and #10980.
diff --git a/src/main/webapp/mydata_fragment.xhtml b/src/main/webapp/mydata_fragment.xhtml
@@ -100,10 +100,10 @@
             <div id="div-search-params" class="well" style="display:none;"></div>
         </div><!-- end: filter column -->
         <!-- start: workspace column -->
-        <div class="col-xs-9">
+        <div class="col-xs-9" id="my_data_filter_column3">
             <div class="text-right" style="" jsf:rendered="#{MyDataPage.isSuperuser()}">
                 #{bundle['mydataFragment.resultsByUserName']}
-                <input type="text" name="userIdentifier" id="userIdentifier" value="#{MyDataPage.getAuthUserIdentifier()}" class="ui-inputfield ui-inputtext ui-widget ui-state-default ui-corner-all"/>
+                <input type="text" name="userIdentifier" id="userIdentifier" value="#{MyDataPage.getAuthUserIdentifier()}" class="ui-inputfield ui-inputtext ui-widget ui-state-default ui-corner-all search-input"/>
             </div>
             <div id="div-pagination"></div>
             <!--<div id="div-test-json" class="well">(pagination)</div>-->
@@ -150,4 +150,4 @@
     </script>
 </div><!-- end panel body -->
 </div><!-- end panel -->
-</ui:composition>
+</ui:composition>
diff --git a/src/main/webapp/resources/js/mydata.js b/src/main/webapp/resources/js/mydata.js
@@ -391,7 +391,7 @@ function submit_my_data_search(){
     // --------------------------------
     // ah, but with the horribly coded xhtml page, we can't use form tags...
     //var formData = $('#mydata_filter_form').serialize();
-    var formData = $("#my_data_filter_column :input").serialize() + '&' + $("#my_data_filter_column2 :input").serialize() ;
+    var formData = $("#my_data_filter_column :input").serialize() + '&' + $("#my_data_filter_column3 :input").serialize()+ '&' + $("#my_data_filter_column2 :input").serialize() ;
 
     // For debugging, show the search params
     if (MYDATA_DEBUG_ON){
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		## Fix My Data filter results by username for Administrators

		The filtering for the username on the MyData page was not working. This is only available for superusers. This fixes the "Results for Username" field to return the data for the desired user. See also #7239 and #10980.