Merge branch 'pr/407' into dev

llaske · Sep 8, 2023 · a33ecc1 · a33ecc1
2 parents 56ba0a9 + 4550787
commit a33ecc1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Add an export button to assignment deliveries #366
 
+### Fixed
+- Next page button in users/assignment view don't take into account search criteria #364
+
 ## [1.5.0] - 2023-02-15
 ### Added
 - Assignments feature: API and Dashboard

diff --git a/dashboard/controller/classrooms/index.js b/dashboard/controller/classrooms/index.js
@@ -29,8 +29,8 @@ exports.index = function(req, res) {
 	};
 
 	//get query params
-	if (req.query.classroom != '') {
-		query['q'] = req.query.classroom;
+	if (req.query.q != '') {
+		query['q'] = req.query.q;
 	}
 	if (req.query.limit != '') {
 		query['limit'] = req.query.limit;

diff --git a/dashboard/controller/users/index.js b/dashboard/controller/users/index.js
@@ -37,8 +37,8 @@ exports.index = function(req, res) {
 	};
 
 	//get query params
-	if (req.query.username != '') {
-		query['q'] = req.query.username;
+	if (req.query.q != '') {
+		query['q'] = req.query.q;
 	}
 	if (req.query.role != '') {
 		query['role'] = req.query.role;

diff --git a/dashboard/views/classrooms.ejs b/dashboard/views/classrooms.ejs
@@ -12,7 +12,7 @@
                       <form method="get" id="user-form">
                         <div class="col-md-3">
                           <div class="form-group form-black label-floating is-empty">
-                              <input data-l10n-id="doe" placeholder="Search Class..." class="form-control" name="classroom" value="<% if(query.q){ %><%= query.q %><% } %>" type="text">
+                              <input data-l10n-id="doe" placeholder="Search Class..." class="form-control" name="q" value="<% if(query.q){ %><%= query.q %><% } %>" type="text">
                               <span class="material-input"></span>
                           </div>
                         </div>

diff --git a/dashboard/views/users.ejs b/dashboard/views/users.ejs
@@ -12,7 +12,7 @@
                       <form method="get" id="user-form">
                             <div class="col-md-2">
                           <div class="form-group form-black label-floating is-empty">
-                              <input data-l10n-id="john" placeholder="John..." class="form-control" id="username" name="username" value="<% if(query.q){ %><%= query.q %><% } %>" type="text">
+                              <input data-l10n-id="john" placeholder="John..." class="form-control" id="username" name="q" value="<% if(query.q){ %><%= query.q %><% } %>" type="text">
                               <span class="material-input"></span>
                           </div>
                         </div>