|
|
@@ -96,14 +96,14 @@ public class ProjectServiceImpl implements ProjectService {
|
|
|
// public
|
|
|
List<CourseProject> publicProjects = courseProjectRepository.findByCourse_IdAndIsPublic(courseId, true);
|
|
|
for (CourseProject courseProject : publicProjects) {
|
|
|
-// projects.getJSONArray("public").add(this.findProjectById(courseProject.getProjectId()));
|
|
|
- if (SecurityUtils.getCurrentUser().getRole() == UserRole.TEACHER) {
|
|
|
- projects.getJSONArray("public").add(findProjectById(courseProject.getProjectId()));
|
|
|
- } else {
|
|
|
- JSONObject object = new JSONObject();
|
|
|
- object.put("id", courseProject.getProjectId());
|
|
|
- projects.getJSONArray("public").add(object);
|
|
|
- }
|
|
|
+ projects.getJSONArray("public").add(this.findProjectById(courseProject.getProjectId()));
|
|
|
+// if (SecurityUtils.getCurrentUser().getRole() == UserRole.TEACHER) {
|
|
|
+// projects.getJSONArray("public").add(findProjectById(courseProject.getProjectId()));
|
|
|
+// } else {
|
|
|
+// JSONObject object = new JSONObject();
|
|
|
+// object.put("id", courseProject.getProjectId());
|
|
|
+// projects.getJSONArray("public").add(object);
|
|
|
+// }
|
|
|
}
|
|
|
// private
|
|
|
JSONArray allProjects = this.findAllProjects();
|