apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'apache/4.18' into main

Browse Source
This commit is contained in:
Abhishek Kumar 2023-04-11 12:06:37 +05:30
commit e6f737fdf9
5 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pom.xml
View File

@ -80,7 +80,7 @@
<cs.clover-maven-plugin.version>4.4.1</cs.clover-maven-plugin.version>
<!-- Logging versions -->
<cs.reload4j.version>1.2.22</cs.reload4j.version>
<cs.reload4j.version>1.2.25</cs.reload4j.version>
<cs.log4j.extras.version>1.2.17</cs.log4j.extras.version>
<cs.logging.version>1.1.1</cs.logging.version>
@ -98,7 +98,7 @@
<cs.commons-net.version>3.7.2</cs.commons-net.version>
<cs.commons-validator.version>1.6</cs.commons-validator.version>
<cs.configuration.version>1.10</cs.configuration.version>
<cs.daemon.version>1.3.1</cs.daemon.version>
<cs.daemon.version>1.3.3</cs.daemon.version>
<cs.dbcp.version>2.9.0</cs.dbcp.version>
<cs.discovery.version>0.5</cs.discovery.version>
<cs.lang.version>2.6</cs.lang.version>
@ -123,10 +123,10 @@
<cs.assertj.version>3.23.1</cs.assertj.version>
<!-- Dependencies versions -->
<cs.amqp-client.version>5.16.0</cs.amqp-client.version>
<cs.amqp-client.version>5.17.0</cs.amqp-client.version>
<cs.apache-cloudstack-java-client.version>1.0.9</cs.apache-cloudstack-java-client.version>
<cs.aspectjrt.version>1.9.9.1</cs.aspectjrt.version>
<cs.aws.sdk.version>1.12.310</cs.aws.sdk.version>
<cs.aspectjrt.version>1.9.19</cs.aspectjrt.version>
<cs.aws.sdk.version>1.12.439</cs.aws.sdk.version>
<cs.axiom.version>1.2.8</cs.axiom.version>
<cs.axis2.version>1.6.4</cs.axis2.version>
<cs.batik.version>1.14</cs.batik.version>
@ -136,12 +136,12 @@
<cs.cxf.version>3.2.14</cs.cxf.version>
<cs.ehcache.version>2.6.11</cs.ehcache.version>
<cs.globodns-client.version>0.0.27</cs.globodns-client.version>
<cs.google-http-client>1.42.2</cs.google-http-client>
<cs.google-http-client>1.42.3</cs.google-http-client>
<cs.groovy.version>2.4.17</cs.groovy.version>
<cs.gson.version>1.7.2</cs.gson.version>
<cs.guava.version>31.1-jre</cs.guava.version>
<cs.httpclient.version>4.5.13</cs.httpclient.version>
<cs.httpcore.version>4.4.15</cs.httpcore.version>
<cs.httpclient.version>4.5.14</cs.httpclient.version>
<cs.httpcore.version>4.4.16</cs.httpcore.version>
<cs.influxdb-java.version>2.22</cs.influxdb-java.version>
<cs.jackson.version>2.13.3</cs.jackson.version>
<cs.jasypt.version>1.9.3</cs.jasypt.version>
@ -152,10 +152,10 @@
<cs.jaxb.version>2.3.0</cs.jaxb.version>
<cs.jaxws.version>2.3.2-1</cs.jaxws.version>
<cs.jersey-client.version>2.26</cs.jersey-client.version>
<cs.jetty.version>9.4.49.v20220914</cs.jetty.version>
<cs.jetty.version>9.4.51.v20230217</cs.jetty.version>
<cs.jetty-maven-plugin.version>9.4.27.v20200227</cs.jetty-maven-plugin.version>
<cs.jna.version>5.5.0</cs.jna.version>
<cs.joda-time.version>2.11.2</cs.joda-time.version>
<cs.joda-time.version>2.12.5</cs.joda-time.version>
<cs.jpa.version>2.2.1</cs.jpa.version>
<cs.jsch.version>0.1.55</cs.jsch.version>
<cs.json.version>20090211</cs.json.version>
@ -179,8 +179,8 @@
<cs.winrm4j.version>0.5.0</cs.winrm4j.version>
<cs.xapi.version>6.2.0-3.1</cs.xapi.version>
<cs.xmlrpc.version>3.1.3</cs.xmlrpc.version>
<cs.xstream.version>1.4.19</cs.xstream.version>
<org.springframework.version>5.3.23</org.springframework.version>
<cs.xstream.version>1.4.20</cs.xstream.version>
<org.springframework.version>5.3.26</org.springframework.version>
<cs.ini.version>0.5.4</cs.ini.version>
<cs.gmaven.version>1.12.0</cs.gmaven.version>
</properties>

10
server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
View File

@ -1162,11 +1162,15 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
if (keyword != null) {
SearchCriteria<UserVmJoinVO> 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);
}

1
ui/public/locales/en.json
View File

@ -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": "<code><b>kubectl</b></code> and <code><b>kubeconfig</b></code> file to access cluster",
"label.use.local.timezone": "Use local timezone",
"label.used": "Used",

4
ui/src/config/section/plugin/quota.js
View File

@ -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'))
},
{

4
ui/src/views/AutogenView.vue
View File

@ -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) {