Quickfix

arc12012 · Apr 7, 2017 · 36ab9f9 · 36ab9f9
1 parent 70f9441
commit 36ab9f9
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/WebContent/html/webpages/adminApprove.jsp b/WebContent/html/webpages/adminApprove.jsp
@@ -81,7 +81,7 @@
 
   <body>
     <nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal">
-    	<%@ include file="navbar.html"%>
+    	<%@ include file="navbar.jsp"%>
     </nav>
 
 	<!-- Modal for choosing ticket action. -->
@@ -140,11 +140,11 @@
 		Ticket[] tickets  = query.getTickets();  
 		User[] users = EmployeeQueries.getAllUsers();
 		Location[] locations = LocationQueries.getAllLocations();
-		ListedDevice[] devices = DeviceQueries.getAllDevices();
+		Device[] devices = DeviceQueries.getAllDevices();
 		String ticketStr = Ticket.arrayToString(tickets);
 		String userStr = User.arrayToString(users);
 		String locationStr = Location.arrayToString(locations).replace("'","\\'");
-		String deviceStr = ListedDevice.arrayToString(devices);
+		String deviceStr = Device.arrayToString(devices);
 		%>
 
 		<script>