diff --git a/pom.xml b/pom.xml
index 4a70731de22..10dce9226fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
4.4.1
- 1.2.22
+ 1.2.25
1.2.17
1.1.1
@@ -98,7 +98,7 @@
3.7.2
1.6
1.10
- 1.3.1
+ 1.3.3
2.9.0
0.5
2.6
@@ -123,10 +123,10 @@
3.23.1
- 5.16.0
+ 5.17.0
1.0.9
- 1.9.9.1
- 1.12.310
+ 1.9.19
+ 1.12.439
1.2.8
1.6.4
1.14
@@ -136,12 +136,12 @@
3.2.14
2.6.11
0.0.27
- 1.42.2
+ 1.42.3
2.4.17
1.7.2
31.1-jre
- 4.5.13
- 4.4.15
+ 4.5.14
+ 4.4.16
2.22
2.13.3
1.9.3
@@ -152,10 +152,10 @@
2.3.0
2.3.2-1
2.26
- 9.4.49.v20220914
+ 9.4.51.v20230217
9.4.27.v20200227
5.5.0
- 2.11.2
+ 2.12.5
2.2.1
0.1.55
20090211
@@ -179,8 +179,8 @@
0.5.0
6.2.0-3.1
3.1.3
- 1.4.19
- 5.3.23
+ 1.4.20
+ 5.3.26
0.5.4
1.12.0
diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
index 211e6db19c0..6fecd2c3c6d 100644
--- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
@@ -1162,11 +1162,15 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
if (keyword != null) {
SearchCriteria ssc = _userVmJoinDao.createSearchCriteria();
- ssc.addOr("displayName", SearchCriteria.Op.LIKE, "%" + keyword + "%");
- ssc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%");
+ String likeKeyword = String.format("%%%s%%", keyword);
+ ssc.addOr("displayName", SearchCriteria.Op.LIKE, likeKeyword);
+ ssc.addOr("name", SearchCriteria.Op.LIKE, likeKeyword);
if (isRootAdmin) {
- ssc.addOr("instanceName", SearchCriteria.Op.LIKE, "%" + keyword + "%");
+ ssc.addOr("instanceName", SearchCriteria.Op.LIKE, likeKeyword);
}
+ ssc.addOr("ipAddress", SearchCriteria.Op.LIKE, likeKeyword);
+ ssc.addOr("publicIpAddress", SearchCriteria.Op.LIKE, likeKeyword);
+ ssc.addOr("ip6Address", SearchCriteria.Op.LIKE, likeKeyword);
ssc.addOr("state", SearchCriteria.Op.EQ, keyword);
sc.addAnd("displayName", SearchCriteria.Op.SC, ssc);
}
diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
index e91e8d3cc0b..ac109e70c1f 100644
--- a/ui/public/locales/en.json
+++ b/ui/public/locales/en.json
@@ -2031,6 +2031,7 @@
"label.usagename": "Usage type",
"label.usageunit": "Unit",
"label.usageislocal": "A Usage Server is installed locally",
+"label.usagetypedescription": "Usage description",
"label.use.kubectl.access.cluster": "kubectl and kubeconfig file to access cluster",
"label.use.local.timezone": "Use local timezone",
"label.used": "Used",
diff --git a/ui/src/config/section/plugin/quota.js b/ui/src/config/section/plugin/quota.js
index 12b36b76ae5..ffa1ae86e65 100644
--- a/ui/src/config/section/plugin/quota.js
+++ b/ui/src/config/section/plugin/quota.js
@@ -78,8 +78,8 @@ export default {
icon: 'credit-card-outlined',
docHelp: 'plugins/quota.html#quota-tariff',
permission: ['quotaTariffList'],
- columns: ['usageName', 'description', 'usageUnit', 'tariffValue', 'tariffActions'],
- details: ['usageName', 'description', 'usageUnit', 'tariffValue'],
+ columns: ['usageName', 'usageTypeDescription', 'usageUnit', 'tariffValue', 'tariffActions'],
+ details: ['usageName', 'usageTypeDescription', 'usageUnit', 'tariffValue'],
component: shallowRef(() => import('@/views/plugins/quota/QuotaTariff.vue'))
},
{
diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue
index 55ab17bf1de..7e81386ad80 100644
--- a/ui/src/views/AutogenView.vue
+++ b/ui/src/views/AutogenView.vue
@@ -1416,13 +1416,13 @@ export default {
continue
}
if (input === undefined || input === null ||
- (input === '' && !['updateStoragePool', 'updateHost', 'updatePhysicalNetwork', 'updateDiskOffering', 'updateNetworkOffering', 'updateServiceOffering'].includes(action.api))) {
+ (input === '' && !['updateStoragePool', 'updateHost', 'updatePhysicalNetwork', 'updateDiskOffering', 'updateNetworkOffering', 'updateServiceOffering', 'updateAccount'].includes(action.api))) {
if (param.type === 'boolean') {
params[key] = false
}
break
}
- if (input === '' && !['tags', 'hosttags', 'storagetags'].includes(key)) {
+ if (input === '' && !['tags', 'hosttags', 'storagetags', 'networkdomain'].includes(key)) {
break
}
if (action.mapping && key in action.mapping && action.mapping[key].options) {