added merge for Programme
This commit is contained in:
parent
f3dcca0dd0
commit
dd1e0b93b8
|
@ -330,6 +330,9 @@ public class Project extends OafEntity implements Serializable {
|
||||||
fundedamount = p.getFundedamount() != null && compareTrust(this, e) < 0
|
fundedamount = p.getFundedamount() != null && compareTrust(this, e) < 0
|
||||||
? p.getFundedamount()
|
? p.getFundedamount()
|
||||||
: fundedamount;
|
: fundedamount;
|
||||||
|
|
||||||
|
programme = mergeLists(programme, p.getProgramme());
|
||||||
|
|
||||||
mergeOAFDataInfo(e);
|
mergeOAFDataInfo(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue