layout and typos

snirye · Apr 19, 2020 · c0f603f · c0f603f
1 parent 63c1770
commit c0f603f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/WebContent/content/AddItem.jsp b/WebContent/content/AddItem.jsp
@@ -16,7 +16,7 @@ Condition:<select class="" name="condition">
   <option value="bad">Bad</option>
 </select><br>
 Description:<input type="text" name="description"><br>
-<input type="file" name="file" value="explore" />
+<input type="file" name="file" value="explore" /><br>
 
 <input type="submit" value="submit"> <input type="reset" value="reset">
 </form>
diff --git a/WebContent/content/AllUsers.jsp b/WebContent/content/AllUsers.jsp
@@ -55,8 +55,16 @@ this is list of ${name} Offers
 			    out.println("<td>"+u.getAddress()+"</td>");
 			    out.println("<td>"+u.getPhone()+"</td>");
 			    out.println("<td>"+u.getGender()+"</td>");
-			    out.println("<td>"+u.getPrivileges()+"</td>");
-			    out.println("<td><a href='MakeAdminServlet?user_id="+u.getUserID()+"'>A</a></td>");
+			    if(u.getPrivileges().equals("0")){
+				    out.println("<td>Admin</td>");
+			    }else {
+				    out.println("<td>User</td>");
+			    }
+			    if(u.getPrivileges().equals("0")){
+				    out.println("<td>-</td>");
+			    }else {
+				    out.println("<td><a href='MakeAdminServlet?user_id="+u.getUserID()+"'>A</a></td>");
+			    }
 			    out.println("<td><a href='RemoveUserServlet?user_id="+u.getUserID()+"'>X</a></td>");
 
 			    out.println("</tr>");

diff --git a/src/controller/ChangeRequestResponeServlet.java b/src/controller/ChangeRequestResponeServlet.java
@@ -64,7 +64,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 						req.setResponse(newResp);
 						mod.editRequest(req);
 					} else {
-						//not the request creaator:
+						//not the request creator:
 						msg="you are not the owner of this request! go away!";
 
 					}

diff --git a/src/controller/ProfilePageServlet.java b/src/controller/ProfilePageServlet.java
@@ -41,7 +41,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 			if(user!=null){	
 				String showUserName=request.getParameter("user_name");
 				model.Users showUser=mod.getUserByUserName(showUserName);
-				if(showUser!=null) {
+				if(showUser==null && showUser.getUserID().equals("null")) {
 				request.setAttribute("show_user", showUser);
 				request.setAttribute("page","content/ProfilePage.jsp");
 				}else {