RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug #1539: Do not reassociate with session resource bound to current user

Browse source 
FEA: ItEr77S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2012-10-03 14:49:07 +02:00
parent f9973f2e79
commit 69f63ce134
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java
View file

@ -82,7 +82,9 @@ import org.libreplan.business.scenarios.entities.Scenario;
import org.libreplan.business.users.daos.IOrderAuthorizationDAO; import org.libreplan.business.users.daos.IOrderAuthorizationDAO;
import org.libreplan.business.users.entities.OrderAuthorization; import org.libreplan.business.users.entities.OrderAuthorization;
import org.libreplan.business.users.entities.ProfileOrderAuthorization; import org.libreplan.business.users.entities.ProfileOrderAuthorization;
import org.libreplan.business.users.entities.User;
import org.libreplan.business.users.entities.UserOrderAuthorization; import org.libreplan.business.users.entities.UserOrderAuthorization;
import org.libreplan.web.UserUtil;
import org.libreplan.web.calendars.BaseCalendarModel; import org.libreplan.web.calendars.BaseCalendarModel;
import org.libreplan.web.planner.TaskElementAdapter; import org.libreplan.web.planner.TaskElementAdapter;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -867,7 +869,16 @@ public class PlanningStateCreator {
} }
public void reassociateResourcesWithSession() { public void reassociateResourcesWithSession() {
User user = UserUtil.getUserFromSession();
boolean isBoundUser = (user != null) && user.isBound();
for (Resource resource : resources) { for (Resource resource : resources) {
if (isBoundUser
&& user.getWorker().getId().equals(resource.getId())) {
// Resource bound to current user is already associated with
// session
continue;
}
resourceDAO.reattach(resource); resourceDAO.reattach(resource);
} }
// ensuring no repeated instances of criterions // ensuring no repeated instances of criterions