Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 8a740ff6

Přidáno uživatelem Tomáš Šimandl před více než 6 roky(ů)

minor fixes

Zobrazit rozdíly:

sources/src/main/java/cz/zcu/kiv/offscreen/servlets/UploadFiles.java
88 88

  
89 89

  
90 90
        DB db = new DB(getServletContext());
91
        Diagram diagram = new Diagram(db);
91 92

  
92 93
        List<Map<String, String>> userDiagramList = new ArrayList<>();
93 94
        if (request.getSession().getAttribute("logged_user") == "1") {
94 95
            int loggedUserId = (int) request.getSession().getAttribute("logged_user_id");
95 96

  
96
            userDiagramList = new Diagram(db).getDiagramListByUserId(loggedUserId);
97
            userDiagramList = diagram.getDiagramListByUserId(loggedUserId);
97 98
        }
98 99
        request.setAttribute("diagramNames", userDiagramList);
99 100

  
100
        List<Map<String, String>> publicDiagramList = new Diagram(db).getDiagramPublicList();
101
        List<Map<String, String>> publicDiagramList = diagram.getDiagramPublicList();
101 102
        request.setAttribute("diagramPublic", publicDiagramList);
102 103

  
103 104
        // render
sources/src/main/java/cz/zcu/kiv/offscreen/servlets/actions/SaveDiagram.java
24 24
            return;
25 25
        }
26 26

  
27
        request.setCharacterEncoding("UTF-8");
27 28
        Integer loggedUserId = Integer.parseInt(request.getSession().getAttribute("logged_user_id").toString());
28 29
        String name = request.getParameter("name");
29 30
        String graphJson = request.getParameter("graph_json");
......
62 63
        diagramParams.put("user_id", loggedUserId.toString());
63 64

  
64 65
        diagram.update(diagramParams);
66

  
67
        response.setStatus(HttpServletResponse.SC_OK);
65 68
    }
66 69
}
sources/src/main/webapp/logged_user_menu.jsp
7 7
	<ul>	
8 8
		<c:forEach items="${diagramNames}" var="diagramName">
9 9
			<li id="diagram_id_${diagramName.id}">
10
				<a href="/graph?diagramId=${diagramPublic.id}">${diagramName.name}</a><a href="#" onclick="return deleteDiagram(${diagramName.id});"><img src="images/button_cancel.png" alt="odstranit" class="imgDelete"/></a>
10
				<a href="/graph?diagramId=${diagramNames.id}">${diagramName.name}</a><a href="#" onclick="return deleteDiagram(${diagramName.id});"><img src="images/button_cancel.png" alt="odstranit" class="imgDelete"/></a>
11 11
			</li>
12 12
		</c:forEach>
13 13
		<li id="diagram_id_new">

Také k dispozici: Unified diff