Merge pull request coral-erm#621 from biblibre/Issue_601_Keep_Search_…

…in_Resource_Module Issue 601: Keep search parameters in resource module
wc-library · Jan 30, 2020 · 6cc256b · 6cc256b
2 parents 961a1e2 + c700df8
commit 6cc256b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/resources/index.php b/resources/index.php
@@ -21,6 +21,9 @@
 
 include_once 'directory.php';
 
+$currentPage = $_SERVER["SCRIPT_NAME"];
+$parts = Explode('/', $currentPage);
+$currentPage = $parts[count($parts) - 1];
 
 //used for creating a "sticky form" for back buttons
 //except we don't want it to retain if they press the 'index' button
@@ -131,8 +134,12 @@
 				$fundCodeLength = strlen($fund['fundCode']) + 3;
 				$combinedLength = strlen($fund['shortName']) + $fundCodeLength;
 				$fundName = ($combinedLength <=50) ? $fund['shortName'] : substr($fund['shortName'],0,49-$fundCodeLength) . "&hellip;";
-				$fundName .= " [" . $fund['fundCode'] . "]</option>";
-				echo "<option value='" . $fund['fundID'] . "'>" . $fundName . "</option>";
+				$fundName .= " [" . $fund['fundCode'] . "]";
+                if (isset($search['fund']) && $search['fund'] == $fund['fundID']) {
+                    echo "<option value='" . $fund['fundID'] . "' selected='selected'>" . $fundName . "</option>";
+                } else {
+                    echo "<option value='" . $fund['fundID'] . "'>" . $fundName . "</option>";
+                }
 		}
 
 			?>
@@ -612,9 +619,9 @@
 		<td class='searchRow'><label for='searchParents'><b>Relationship</b></label>
 		<select name='search[parent]' id='searchParents' style='width:150px'>
 			<option value=''><?php echo _("All");?></option>
-			<option value='RRC'><?php echo _("Parent");?></option>
-			<option value='RRP'><?php echo _("Child");?></option>
-			<option value='None'><?php echo _("None");?></option>
+			<option value='RRC'<?php if (isset($search['parent']) && $search['parent'] == 'RRC') { echo " selected='selected'"; }; echo ">" ._("Parent");?></option>
+			<option value='RRP'<?php if (isset($search['parent']) && $search['parent'] == 'RRP') { echo " selected='selected'"; }; echo ">" . _("Child");?></option>
+			<option value='None'<?php if (isset($search['parent']) && $search['parent'] == 'None') { echo " selected='selected'"; }; echo ">" . _("None");?></option>
 		</select>
 	</td>
 	</tr>

diff --git a/resources/resource.php b/resources/resource.php
@@ -25,6 +25,10 @@
 $status = new Status(new NamedArguments(array('primaryKey' => $resource->statusID)));
 $resourceAcquisitions = $resource->getResourceAcquisitions();
 
+$currentPage = $_SERVER["SCRIPT_NAME"];
+$parts = Explode('/', $currentPage);
+$currentPage = $parts[count($parts) - 1];
+
 
 //used to get default email address for feedback link in the right side panel
 $config = new Configuration();
@@ -34,7 +38,7 @@
 if ((isset($_GET['ref'])) && ($_GET['ref'] == 'new')){
   CoralSession::set('ref_script', 'new');
 }else{
-  CoralSession::set('ref_script', $currentPage = '');
+  CoralSession::set('ref_script', $currentPage);
 }
 
 //set this to turn off displaying the title header in header.php