Merge branch 'pop'
This commit is contained in:
commit
6c25eea12f
@ -292,7 +292,19 @@ public class GroupService {
|
|||||||
entityManager.detach(set);
|
entityManager.detach(set);
|
||||||
set.setId(null);
|
set.setId(null);
|
||||||
set.setPermission("GROUP");
|
set.setPermission("GROUP");
|
||||||
|
StudyGroupMember groupLeader = null;
|
||||||
|
for (StudyGroupMember studyGroupMember : group.getMembers()){
|
||||||
|
if (studyGroupMember.getIsGroupLeader())
|
||||||
|
{
|
||||||
|
groupLeader = studyGroupMember;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (groupLeader != null && groupLeader.getUser().getId() == user.getId()){
|
||||||
|
set.setStatus("VERIFIED");
|
||||||
|
} else {
|
||||||
set.setStatus("UNVERIFIED");
|
set.setStatus("UNVERIFIED");
|
||||||
|
}
|
||||||
set.setGroup(group);
|
set.setGroup(group);
|
||||||
this.setRepository.save(set);
|
this.setRepository.save(set);
|
||||||
this.userActivityService.saveActivity("addedResource", 0, null, user, null, group, null, set, null);
|
this.userActivityService.saveActivity("addedResource", 0, null, user, null, group, null, set, null);
|
||||||
@ -316,7 +328,19 @@ public class GroupService {
|
|||||||
entityManager.detach(material);
|
entityManager.detach(material);
|
||||||
material.setId(null);
|
material.setId(null);
|
||||||
material.setPermission("GROUP");
|
material.setPermission("GROUP");
|
||||||
|
StudyGroupMember groupLeader = null;
|
||||||
|
for (StudyGroupMember studyGroupMember : group.getMembers()){
|
||||||
|
if (studyGroupMember.getIsGroupLeader())
|
||||||
|
{
|
||||||
|
groupLeader = studyGroupMember;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (groupLeader != null && groupLeader.getUser().getId() == user.getId()){
|
||||||
|
material.setStatus("VERIFIED");
|
||||||
|
} else {
|
||||||
material.setStatus("UNVERIFIED");
|
material.setStatus("UNVERIFIED");
|
||||||
|
}
|
||||||
material.setGroup(group);
|
material.setGroup(group);
|
||||||
this.materialRepository.save(material);
|
this.materialRepository.save(material);
|
||||||
this.userActivityService.saveActivity("addedResource", 0, null, user, null, group, material, null, null);
|
this.userActivityService.saveActivity("addedResource", 0, null, user, null, group, material, null, null);
|
||||||
@ -368,7 +392,19 @@ public class GroupService {
|
|||||||
entityManager.detach(test);
|
entityManager.detach(test);
|
||||||
test.setId(null);
|
test.setId(null);
|
||||||
test.setPermission("GROUP");
|
test.setPermission("GROUP");
|
||||||
|
StudyGroupMember groupLeader = null;
|
||||||
|
for (StudyGroupMember studyGroupMember : group.getMembers()){
|
||||||
|
if (studyGroupMember.getIsGroupLeader())
|
||||||
|
{
|
||||||
|
groupLeader = studyGroupMember;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (groupLeader != null && groupLeader.getUser().getId() == user.getId()){
|
||||||
|
test.setStatus("VERIFIED");
|
||||||
|
} else {
|
||||||
test.setStatus("UNVERIFIED");
|
test.setStatus("UNVERIFIED");
|
||||||
|
}
|
||||||
test.setGroup(group);
|
test.setGroup(group);
|
||||||
this.testRepository.save(test);
|
this.testRepository.save(test);
|
||||||
this.userActivityService.saveActivity("addedResource", 0, null, user, null, group, null, null, test);
|
this.userActivityService.saveActivity("addedResource", 0, null, user, null, group, null, null, test);
|
||||||
|
Loading…
Reference in New Issue
Block a user