Merge pull request #29 from BioKIC/master

Occurrence Label Module
BioKIC · Feb 3, 2021 · 602a489 · 602a489
2 parents 3cd8733 + 83f2098
commit 602a489
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/collections/reports/labelmanager.php b/collections/reports/labelmanager.php
@@ -121,7 +121,7 @@ function changeFormExport(buttonElem, action, target){
 						return false;
 					}
 				}
-				else if(action == "labelsword.php" && f.packetradio.checked == true){
+				else if(action == "labelsword.php" && f.labeltype.valye == "packet"){
 					alert("Packet labels are not yet available as a Word document");
 					return false;
 				}

diff --git a/collections/reports/labelsword.php b/collections/reports/labelsword.php
@@ -17,11 +17,11 @@
 $labelManager = new OccurrenceLabel();
 
 $collid = $_POST["collid"];
-$hPrefix = $_POST['lhprefix'];
-$hMid = $_POST['lhmid'];
-$hSuffix = $_POST['lhsuffix'];
+$hPrefix = $_POST['hprefix'];
+$hMid = $_POST['hmid'];
+$hSuffix = $_POST['hsuffix'];
 $lFooter = $_POST['lfooter'];
-$columnCount = $_POST['columncount'];
+$columnCount = $_POST['labeltype'];
 $includeSpeciesAuthor = ((array_key_exists('speciesauthors',$_POST) && $_POST['speciesauthors'])?1:0);
 $showcatalognumbers = ((array_key_exists('catalognumbers',$_POST) && $_POST['catalognumbers'])?1:0);
 $useBarcode = array_key_exists('bc',$_POST)?$_POST['bc']:0;