From 0a91d1bc9bd82207f847fbf97889cdcfd68486b5 Mon Sep 17 00:00:00 2001 From: Connor L Jackson Date: Thu, 23 Mar 2017 21:32:10 -0400 Subject: [PATCH] Multiple Important Changes Making sure everything works after the amazing great merge. --- WebContent/adminLogin.jsp | 2 ++ WebContent/html/webpages/adminLocation.jsp | 2 +- WebContent/html/webpages/index.jsp | 5 ++--- WebContent/html/webpages/navbar.html | 4 ++-- WebContent/html/webpages/orderFormHandler.jsp | 3 ++- WebContent/html/webpages/shoppingCart.jsp | 2 +- WebContent/userLogin.jsp | 4 +++- src/database/MySQLAccess.java | 8 +++++++- 8 files changed, 20 insertions(+), 10 deletions(-) diff --git a/WebContent/adminLogin.jsp b/WebContent/adminLogin.jsp index c3bcff5..ffd6dc8 100644 --- a/WebContent/adminLogin.jsp +++ b/WebContent/adminLogin.jsp @@ -19,8 +19,10 @@ if (result.next()){ adminCookie = new Cookie("ssoNum", Integer.toString(ssoNum)); adminCookie.setMaxAge(30*60); response.addCookie(adminCookie); + statement.close(); response.sendRedirect("html/webpages/admin.html"); } else { + statement.close(); response.sendRedirect("index.jsp"); } diff --git a/WebContent/html/webpages/adminLocation.jsp b/WebContent/html/webpages/adminLocation.jsp index 7e8db38..573f6aa 100644 --- a/WebContent/html/webpages/adminLocation.jsp +++ b/WebContent/html/webpages/adminLocation.jsp @@ -311,7 +311,7 @@ //database connection MySQLAccess myaccess = new MySQLAccess(); //database query -Location[] locations = myaccess.getLocations(); +Location[] locations = myaccess.getAdminLocations(); //string representation of array. String locationString = Location.arrayToString(locations); locationString = locationString.replace("'","\\'"); diff --git a/WebContent/html/webpages/index.jsp b/WebContent/html/webpages/index.jsp index df2fa47..e31fe6f 100644 --- a/WebContent/html/webpages/index.jsp +++ b/WebContent/html/webpages/index.jsp @@ -1,4 +1,3 @@ -<<<<<<< HEAD:WebContent/html/webpages/index.jsp @@ -48,13 +47,13 @@
- +

Request

Check out our selection of devices that YOU have the chance to check out!

 - +

Return

All set with a device? No problem! You can return it here!

diff --git a/WebContent/html/webpages/navbar.html b/WebContent/html/webpages/navbar.html index 78d93dd..a6f308b 100644 --- a/WebContent/html/webpages/navbar.html +++ b/WebContent/html/webpages/navbar.html @@ -13,8 +13,8 @@