Merge release branch 4.13 to master

* 4.13:
  server: fix database exception while searching network offerings (#3947)
This commit is contained in:
Daan Hoogland 2020-03-06 10:44:43 +01:00
commit dc225de811

View File

@ -5357,7 +5357,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
final Object keyword = cmd.getKeyword();
if (keyword != null) {
final SearchCriteria<NetworkOfferingVO> ssc = _networkOfferingDao.createSearchCriteria();
final SearchCriteria<NetworkOfferingJoinVO> ssc = networkOfferingJoinDao.createSearchCriteria();
ssc.addOr("displayText", SearchCriteria.Op.LIKE, "%" + keyword + "%");
ssc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%");