Skip to content
Jump to bottom

Bugs #112

Merged
merged 2 commits into from Apr 13, 2017
Merged

Bugs #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8da70d8
Redirect wasn't quite working
clj13001 Apr 13, 2017
6fd0ac4
Merge remote-tracking branch 'refs/remotes/origin/master' into bugs
clj13001 Apr 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion WebContent/html/webpages/navbar.jsp
View file
Open in desktop
Expand Up @@ -43,8 +43,10 @@
}
}
}
if(navsso.equals("invalid"))//if we didn't get a cookie, redirect to the homepage to log in again!
if(navsso.equals("invalid")){//if we didn't get a cookie, redirect to the homepage to log in again!
response.sendRedirect("../../index.jsp");
return;
}
else{
self = EmployeeQueries.getEmployeeByID(Integer.parseInt(navsso));
navname = self.getName();
Expand Down
18 changes: 4 additions & 14 deletions WebContent/html/webpages/returnPage.jsp
View file
Open in desktop
Expand Up @@ -74,11 +74,11 @@
width: 20px;
}
</style>
<nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal">
<%@ include file="navbar.jsp"%>
</nav>
</head>
<body>
<nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal">
<%@ include file="navbar.jsp"%>
</nav>
<!-- Modal for transaction review. -->
<div id="orderInfoModal" class="modal">
<div class="modal-content">
Expand Down Expand Up @@ -122,17 +122,7 @@
</div>

<%
//get user information
Cookie[] cookies = request.getCookies();
String sso = "";
for(Cookie c : cookies){
if(c.getName().equals("ssoNum")){
sso = c.getValue();
break;
}
}

Device[] mydevices = DeviceQueries.getUserDevices(sso);
Device[] mydevices = DeviceQueries.getUserDevices(navsso);
//string representation of array.
String deviceString = Device.arrayToString(mydevices);
%>
Expand Down