This is an automated email from the ASF dual-hosted git repository.
jfthomps pushed a commit to branch VCL-1114_misc_small_web_updates
in repository https://gitbox.apache.org/repos/asf/vcl.git
commit 5cd049b96f2d174511abb16b49635c378b6b3a4a
Author: Josh Thompson <jftho...@ncsu.edu>
AuthorDate: Tue May 21 16:04:05 2019 -0400
VCL-1114 - miscellaneous small web updates
utils.php:
-modified getImages: added ORDER BY to query to get image revision data so
that revisions will be properly ordered when user is prompted to select a
revision to reserve - out of order didn't show up if all revisions were owned
by the same user so didn't notice this earlier
-modified getNATports: fixed header documentation that listed function name
as getReservationNATports instead of getNATports
---
web/.ht-inc/utils.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/web/.ht-inc/utils.php b/web/.ht-inc/utils.php
index 71b9e3f..a44915e 100644
--- a/web/.ht-inc/utils.php
+++ b/web/.ht-inc/utils.php
@@ -1459,7 +1459,8 @@ function getImages($includedeleted=0, $imageid=0) {
. "WHERE i.userid = u.id AND ";
if(! $includedeleted)
$query .= "i.deleted = 0 AND ";
- $query .= "u.affiliationid = a.id";
+ $query .= "u.affiliationid = a.id "
+ . "ORDER BY i.imageid, i.revision";
$qh = doQuery($query, 101);
while($row = mysqli_fetch_assoc($qh)) {
$id = $row['imageid'];
@@ -9428,7 +9429,7 @@ function getNAThosts($id=0, $sort=0) {
////////////////////////////////////////////////////////////////////////////////
///
-/// \fn getReservationNATports($resid)
+/// \fn getNATports($resid)
///
/// \param $resid - id of a reservation
///
