lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #26 from bsinno/MECS-1452_Support_additional_field_name_and_operators_in_search_query

Browse Source 
Support additional field name and operators in search query
This commit is contained in:
Michael Hirsch
2016-02-08 09:45:04 +01:00
parent 91e968cc8b d100e255c7
commit f85c3b00b9
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java
View File

@@ -51,7 +51,16 @@ public enum TargetFields implements FieldNameProvider {
*/ */
ATTRIBUTE("targetInfo.controllerAttributes", true), ATTRIBUTE("targetInfo.controllerAttributes", true),
/**
* distribution sets which is assigned to the target.
*/
ASSIGNEDDS("assignedDistributionSet", "name", "version"), ASSIGNEDDS("assignedDistributionSet", "name", "version"),
/**
* distribution sets which is installed on the target.
*/
INSTALLEDDS("targetInfo.installedDistributionSet", "name", "version"),
/** /**
* The tags field. * The tags field.
*/ */

7
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java
View File

@@ -126,11 +126,14 @@ public class CustomTargetBeanQuery extends AbstractBeanQuery<ProxyTarget> {
prxyTarget.setInstalledDistributionSet(installedDistributionSet); prxyTarget.setInstalledDistributionSet(installedDistributionSet);
final DistributionSet assignedDistributionSet = target.getAssignedDistributionSet(); final DistributionSet assignedDistributionSet = target.getAssignedDistributionSet();
prxyTarget.setAssignedDistributionSet(assignedDistributionSet); prxyTarget.setAssignedDistributionSet(assignedDistributionSet);
if (null != assignedDistributionSet) { if (null != assignedDistributionSet) {
prxyTarget.setAssignedDistNameVersion(assignedDistributionSet.getName()); prxyTarget.setAssignedDistNameVersion(HawkbitCommonUtil.getFormattedNameVersion(
assignedDistributionSet.getName(), assignedDistributionSet.getVersion()));
} }
if (null != installedDistributionSet) { if (null != installedDistributionSet) {
prxyTarget.setInstalledDistNameVersion(installedDistributionSet.getName()); prxyTarget.setInstalledDistNameVersion(HawkbitCommonUtil.getFormattedNameVersion(
installedDistributionSet.getName(), installedDistributionSet.getVersion()));
} }
prxyTarget.setUpdateStatus(targ.getTargetInfo().getUpdateStatus()); prxyTarget.setUpdateStatus(targ.getTargetInfo().getUpdateStatus());
prxyTarget.setLastTargetQuery(targ.getTargetInfo().getLastTargetQuery()); prxyTarget.setLastTargetQuery(targ.getTargetInfo().getLastTargetQuery());