anmolbabu has uploaded a new change for review.
Change subject: webadmin : Volume main and sub tabs' columns sortable
......................................................................
webadmin : Volume main and sub tabs' columns sortable
this patch incorporates the sortable columns to the
volume main and sub tabs', "host" tab's "brick" sub tabs
columns.
Change-Id: I4795251fc2a73eb347f1e891d6c5f40ed8a67e47
Signed-off-by: Anmol Babu <anb...@redhat.com>
---
M
backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/gluster/GlusterVolumeConditionFieldAutoCompleter.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVolumeView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeBrickView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeParameterView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostBrickView.java
6 files changed, 18 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/30185/1
diff --git
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/gluster/GlusterVolumeConditionFieldAutoCompleter.java
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/gluster/GlusterVolumeConditionFieldAutoCompleter.java
index b258f19..46bb5cd 100644
---
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/gluster/GlusterVolumeConditionFieldAutoCompleter.java
+++
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/gluster/GlusterVolumeConditionFieldAutoCompleter.java
@@ -26,7 +26,7 @@
public class GlusterVolumeConditionFieldAutoCompleter extends
BaseConditionFieldAutoCompleter {
public final static GlusterVolumeConditionFieldAutoCompleter INSTANCE =
new GlusterVolumeConditionFieldAutoCompleter();
- private enum FIELDS {
+ public enum FIELDS {
NAME,
TYPE,
TRANSPORT_TYPE,
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java
index 0ddc258..8680fe8 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java
@@ -391,12 +391,17 @@
@Override
protected void syncSearch() {
- SearchParameters tempVar = new SearchParameters(getSearchString(),
SearchType.GlusterVolume, isCaseSensitiveSearch());
+ SearchParameters tempVar = new
SearchParameters(applySortOptions(getSearchString()), SearchType.GlusterVolume,
isCaseSensitiveSearch());
tempVar.setMaxCount(getSearchPageSize());
super.syncSearch(VdcQueryType.Search, tempVar);
}
@Override
+ public boolean supportsServerSideSorting() {
+ return true;
+ }
+
+ @Override
protected void onSelectedItemChanged() {
super.onSelectedItemChanged();
updateActionAvailability();
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVolumeView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVolumeView.java
index 1c23cbba..02fee5d 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVolumeView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVolumeView.java
@@ -9,6 +9,7 @@
import
org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity;
import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeType;
import org.ovirt.engine.core.common.businessentities.gluster.TransportType;
+import
org.ovirt.engine.core.searchbackend.gluster.GlusterVolumeConditionFieldAutoCompleter;
import org.ovirt.engine.ui.common.idhandler.ElementIdHandler;
import org.ovirt.engine.ui.common.uicommon.model.MainModelProvider;
import org.ovirt.engine.ui.common.widget.action.ActionButtonDefinition;
@@ -67,6 +68,8 @@
return object.getName();
}
};
+
nameColumn.makeSortable(GlusterVolumeConditionFieldAutoCompleter.FIELDS.NAME.toString());
+
getTable().addColumn(nameColumn, constants.NameVolume(), "150px");
//$NON-NLS-1$
TextColumnWithTooltip<GlusterVolumeEntity> clusterColumn = new
TextColumnWithTooltip<GlusterVolumeEntity>() {
@@ -85,6 +88,7 @@
return object.getVolumeType();
}
};
+
volumeTypeColumn.makeSortable(GlusterVolumeConditionFieldAutoCompleter.FIELDS.TYPE.toString());
getTable().addColumn(volumeTypeColumn, constants.volumeTypeVolume(),
"150px"); //$NON-NLS-1$
getTable().addColumn(new VolumeBrickStatusColumn(),
constants.bricksStatusVolume(), "150px"); //$NON-NLS-1$
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeBrickView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeBrickView.java
index d106c7a..a3f0aa2 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeBrickView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeBrickView.java
@@ -56,6 +56,7 @@
return brick.getServerName();
}
};
+ serverColumn.makeSortable();
getTable().addColumn(serverColumn, constants.serverVolumeBrick(),
"300px"); //$NON-NLS-1$
TextColumnWithTooltip<GlusterBrickEntity> directoryColumn = new
TextColumnWithTooltip<GlusterBrickEntity>() {
@@ -64,6 +65,8 @@
return brick.getBrickDirectory();
}
};
+ directoryColumn.makeSortable();
+
getTable().addColumn(directoryColumn,
constants.brickDirectoryVolumeBrick(), "400px"); //$NON-NLS-1$
getTable().addColumn(new PercentColumn<GlusterBrickEntity>() {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeParameterView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeParameterView.java
index 041b8cf..e609830 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeParameterView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeParameterView.java
@@ -39,6 +39,7 @@
return option.getKey();
}
};
+ optionKeyColumn.makeSortable();
getTable().addColumn(optionKeyColumn,
constants.optionKeyVolumeParameter(), "400px"); //$NON-NLS-1$
TextColumnWithTooltip<GlusterVolumeOptionEntity> optionValueColumn =
new TextColumnWithTooltip<GlusterVolumeOptionEntity>() {
@@ -47,6 +48,7 @@
return option.getValue();
}
};
+ optionValueColumn.makeSortable();
getTable().addColumn(optionValueColumn,
constants.optionValueVolumeParameter(), "400px"); //$NON-NLS-1$;
getTable().addActionButton(new
WebAdminButtonDefinition<GlusterVolumeOptionEntity>(constants.addVolumeParameter())
{
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostBrickView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostBrickView.java
index 7a69611..40e27d7 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostBrickView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostBrickView.java
@@ -34,6 +34,7 @@
return object.getVolumeName();
}
};
+ volNameColumn.makeSortable();
getTable().addColumn(volNameColumn, constants.volumeName());
//$NON-NLS-1$
TextColumnWithTooltip<GlusterBrickEntity> brickDirColumn = new
TextColumnWithTooltip<GlusterBrickEntity>() {
@@ -42,6 +43,7 @@
return object.getBrickDirectory();
}
};
+ brickDirColumn.makeSortable();
getTable().addColumn(brickDirColumn, constants.brickDirectoryBricks(),
"220px"); //$NON-NLS-1$
}
--
To view, visit http://gerrit.ovirt.org/30185
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4795251fc2a73eb347f1e891d6c5f40ed8a67e47
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5
Gerrit-Owner: anmolbabu <anb...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
