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

Bug #1463: Fix issue changing order in parameters of entry point

Browse source 
The problem was that before the change, the children of the order returned a
proxy when you used the method getOrder() over them. However, this doesn't
happen if you change the order of the parameters.

I guess that this is because of the converter of the Order is now called before
the converter of the OrderElement and the problem disappears.

FEA: ItEr76S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2012-06-11 11:24:07 +02:00
parent 43044a78af
commit cc34202f84
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/IGlobalViewEntryPoints.java
View file

@ -53,8 +53,8 @@ public interface IGlobalViewEntryPoints {
@EntryPoint("order")
public void goToOrder(Order order);
@EntryPoint( { "orderElement", "order" })
public void goToOrderElementDetails(OrderElement orderElement, Order order);
@EntryPoint({ "order", "orderElement" })
public void goToOrderElementDetails(Order order, OrderElement orderElement);
@EntryPoint("limiting_resources")
void goToCompanyLimitingResources();

2
libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java
View file

@ -450,7 +450,7 @@ public class MultipleTabsPlannerController implements Composer,
}
@Override
public void goToOrderElementDetails(OrderElement orderElement, Order order) {
public void goToOrderElementDetails(Order order, OrderElement orderElement) {
getTabsRegistry().show(ordersTab, changeModeTo(order));
orderCRUDController.highLight(orderElement);
}

2
libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java
View file

@ -132,7 +132,7 @@ public class OrderElementHistoricalAssignmentComponent extends HtmlMacroComponen
OrderElement orderElement = dto.getOrderElement();
Order order = dto.getOrder();
if (model.getCurrentScenario().contains(order)) {
globalView.goToOrderElementDetails(orderElement, order);
globalView.goToOrderElementDetails(order, orderElement);
} else {
try {
String scenarios = "";