Noam Slomianko has uploaded a new change for review.
Change subject: engine: engine: add comment field to vm pool
......................................................................
engine: engine: add comment field to vm pool
Part of the adding a comment field to many parts of the system
- add to db
- change dao
- add comment to VmPool
- add comment to PoolGeneralModel, PoolListModel
- reflect changes in the UI, namely to the PoolGeneralModelForm
Bug-Url: https://bugzilla.redhat.com/610501
Change-Id: Ibc24a7ba6b8bbe92429d6e567079d09bc212dcc3
Signed-off-by: Noam Slomianko <[email protected]>
---
M backend/manager/dbscripts/create_views.sql
A backend/manager/dbscripts/upgrade/03_03_0070_add_comment_vm_pools.sql
M backend/manager/dbscripts/vm_pools_sp.sql
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmPoolOperationParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPool.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAODbFacadeImpl.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/PoolGeneralModelForm.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabPoolView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolGeneralView.java
14 files changed, 80 insertions(+), 15 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/05/14505/1
diff --git a/backend/manager/dbscripts/create_views.sql
b/backend/manager/dbscripts/create_views.sql
index 76f9156..20c06ac 100644
--- a/backend/manager/dbscripts/create_views.sql
+++ b/backend/manager/dbscripts/create_views.sql
@@ -766,8 +766,8 @@
CREATE OR REPLACE VIEW vm_pools_view
AS
-SELECT vm_pools.vm_pool_id as vm_pool_id, vm_pools.vm_pool_name as
vm_pool_name, vm_pools.vm_pool_description as vm_pool_description,
vm_pools.vm_pool_type as vm_pool_type,
- vm_pools.parameters as parameters,
vm_pools.prestarted_vms as prestarted_vms, vm_pools.vds_group_id as
vds_group_id, vds_groups.name as vds_group_name
+SELECT vm_pools.vm_pool_id as vm_pool_id, vm_pools.vm_pool_name as
vm_pool_name, vm_pools.vm_pool_description as vm_pool_description,
vm_pools.vm_pool_comment as vm_pool_comment,
+ vm_pools.vm_pool_type as vm_pool_type, vm_pools.parameters as
parameters, vm_pools.prestarted_vms as prestarted_vms, vm_pools.vds_group_id as
vds_group_id, vds_groups.name as vds_group_name
FROM vm_pools INNER JOIN
vds_groups ON vm_pools.vds_group_id = vds_groups.vds_group_id;
@@ -776,7 +776,8 @@
CREATE OR REPLACE VIEW vm_pools_full_view
AS
-SELECT vm_pool_id as vm_pool_id, vm_pool_name as vm_pool_name,
vm_pool_description as vm_pool_description, vm_pool_type as vm_pool_type,
parameters as parameters, prestarted_vms as prestarted_vms, vds_group_id as
vds_group_id, vds_group_name as vds_group_name,
+SELECT vm_pool_id as vm_pool_id, vm_pool_name as vm_pool_name,
vm_pool_description as vm_pool_description, vm_pool_comment as vm_pool_comment,
+ vm_pool_type as vm_pool_type, parameters as parameters,
prestarted_vms as prestarted_vms, vds_group_id as vds_group_id, vds_group_name
as vds_group_name,
(SELECT COUNT(vm_pool_map.vm_pool_id) as Expr1
FROM vm_pools_view AS v1 LEFT OUTER JOIN
vm_pool_map ON v1.vm_pool_id = vm_pool_map.vm_pool_id AND v1.vm_pool_id =
vmp.vm_pool_id) as assigned_vm_count,
diff --git
a/backend/manager/dbscripts/upgrade/03_03_0070_add_comment_vm_pools.sql
b/backend/manager/dbscripts/upgrade/03_03_0070_add_comment_vm_pools.sql
new file mode 100644
index 0000000..513ee9e
--- /dev/null
+++ b/backend/manager/dbscripts/upgrade/03_03_0070_add_comment_vm_pools.sql
@@ -0,0 +1 @@
+select fn_db_add_column('vm_pools', 'vm_pool_comment', 'VARCHAR(4000) NOT NULL
default ''''');
diff --git a/backend/manager/dbscripts/vm_pools_sp.sql
b/backend/manager/dbscripts/vm_pools_sp.sql
index b91f9ab..1e19ee1 100644
--- a/backend/manager/dbscripts/vm_pools_sp.sql
+++ b/backend/manager/dbscripts/vm_pools_sp.sql
@@ -4,6 +4,7 @@
Create or replace FUNCTION InsertVm_pools(v_vm_pool_description VARCHAR(4000),
+ v_vm_pool_comment VARCHAR(4000),
v_vm_pool_id UUID ,
v_vm_pool_name VARCHAR(255),
v_vm_pool_type INTEGER,
@@ -13,8 +14,8 @@
RETURNS VOID
AS $procedure$
BEGIN
- INSERT INTO vm_pools(vm_pool_id,vm_pool_description, vm_pool_name,
vm_pool_type,parameters, prestarted_vms, vds_group_id)
- VALUES(v_vm_pool_id,v_vm_pool_description,
v_vm_pool_name,v_vm_pool_type,v_parameters, v_prestarted_vms, v_vds_group_id);
+ INSERT INTO vm_pools(vm_pool_id,vm_pool_description, vm_pool_comment,
vm_pool_name, vm_pool_type,parameters, prestarted_vms, vds_group_id)
+ VALUES(v_vm_pool_id,v_vm_pool_description, v_vm_pool_comment,
v_vm_pool_name,v_vm_pool_type,v_parameters, v_prestarted_vms, v_vds_group_id);
END; $procedure$
LANGUAGE plpgsql;
@@ -23,6 +24,7 @@
Create or replace FUNCTION UpdateVm_pools(v_vm_pool_description VARCHAR(4000),
+ v_vm_pool_comment VARCHAR(4000),
v_vm_pool_id UUID,
v_vm_pool_name VARCHAR(255),
v_vm_pool_type INTEGER,
@@ -35,7 +37,7 @@
AS $procedure$
BEGIN
UPDATE vm_pools
- SET vm_pool_description = v_vm_pool_description,vm_pool_name =
v_vm_pool_name,
+ SET vm_pool_description = v_vm_pool_description, vm_pool_comment=
v_vm_pool_comment, vm_pool_name = v_vm_pool_name,
vm_pool_type = v_vm_pool_type,parameters = v_parameters, prestarted_vms
= v_prestarted_vms, vds_group_id = v_vds_group_id
WHERE vm_pool_id = v_vm_pool_id;
END; $procedure$
@@ -66,7 +68,7 @@
DROP TYPE IF EXISTS GetAllFromVm_pools_rs CASCADE;
-Create type GetAllFromVm_pools_rs AS (vm_pool_id UUID, assigned_vm_count
INTEGER, vm_running_count INTEGER, vm_pool_description VARCHAR(4000),
vm_pool_name VARCHAR(255), vm_pool_type INTEGER, parameters VARCHAR(200),
prestarted_vms INTEGER, vds_group_id UUID, vds_group_name VARCHAR(40));
+Create type GetAllFromVm_pools_rs AS (vm_pool_id UUID, assigned_vm_count
INTEGER, vm_running_count INTEGER, vm_pool_description
VARCHAR(4000),vm_pool_comment VARCHAR(4000), vm_pool_name VARCHAR(255),
vm_pool_type INTEGER, parameters VARCHAR(200), prestarted_vms INTEGER,
vds_group_id UUID, vds_group_name VARCHAR(40));
Create or replace FUNCTION GetAllFromVm_pools() RETURNS SETOF
GetAllFromVm_pools_rs
AS $procedure$
BEGIN
@@ -131,6 +133,7 @@
assigned_vm_count INTEGER,
vm_running_count INTEGER,
vm_pool_description VARCHAR(4000),
+ vm_pool_comment VARCHAR(4000),
vm_pool_name VARCHAR(255),
vm_pool_type INTEGER,
parameters VARCHAR(200),
@@ -145,6 +148,7 @@
assigned_vm_count,
vm_running_count,
vm_pool_description,
+ vm_pool_comment,
vm_pool_name,
vm_pool_type,
parameters,
@@ -152,7 +156,7 @@
vds_group_id,
vds_group_name)
select ppr.vm_pool_id, ppr.assigned_vm_count, ppr.vm_running_count,
- p.vm_pool_description, p.vm_pool_name,
p.vm_pool_type, p.parameters, p.prestarted_vms,
+ p.vm_pool_description, p.vm_pool_comment,
p.vm_pool_name, p.vm_pool_type, p.parameters, p.prestarted_vms,
p.vds_group_id, p.vds_group_name
from tt_VM_POOL_PRERESULT ppr
inner join vm_pools_view p on ppr.vm_pool_id = p.vm_pool_id;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmPoolOperationParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmPoolOperationParameters.java
index 8bf1e61..cddf402 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmPoolOperationParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmPoolOperationParameters.java
@@ -13,6 +13,7 @@
super(vm_pools.getVmPoolId());
String tempVar = vm_pools.getVmPoolDescription();
vm_pools.setVmPoolDescription((tempVar != null) ? tempVar : "");
+
_vmPool = vm_pools;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPool.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPool.java
index c2db042..5feb168 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPool.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPool.java
@@ -29,6 +29,9 @@
@Size(max = BusinessEntitiesDefinitions.GENERAL_MAX_SIZE)
private String description;
+ @Size(max = BusinessEntitiesDefinitions.GENERAL_MAX_SIZE)
+ private String comment;
+
private VmPoolType type = VmPoolType.Automatic;
@Size(max = BusinessEntitiesDefinitions.VM_POOL_PARAMS)
@@ -68,6 +71,7 @@
result = prime * result + ((vdsGroupName == null) ? 0 :
vdsGroupName.hashCode());
result = prime * result + vmPoolAssignedCount;
result = prime * result + ((description == null) ? 0 :
description.hashCode());
+ result = prime * result + ((comment == null) ? 0 : comment.hashCode());
result = prime * result + ((name == null) ? 0 : name.hashCode());
result = prime * result + vmPoolRunningCount;
result = prime * result + ((type == null) ? 0 : type.hashCode());
@@ -93,6 +97,7 @@
&& ObjectUtils.objectsEqual(parameters, other.parameters)
&& ObjectUtils.objectsEqual(vdsGroupId, other.vdsGroupId)
&& ObjectUtils.objectsEqual(description, other.description)
+ && ObjectUtils.objectsEqual(comment, other.comment)
&& ObjectUtils.objectsEqual(name, other.name)
&& ObjectUtils.objectsEqual(type, other.type));
}
@@ -183,6 +188,14 @@
this.description = value;
}
+ public String getVmPoolComment() {
+ return comment;
+ }
+
+ public void setVmPoolComment(String value) {
+ comment = value;
+ }
+
public Guid getVmPoolId() {
return this.id;
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAODbFacadeImpl.java
index 27fc683..8921451 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmPoolDAODbFacadeImpl.java
@@ -78,6 +78,7 @@
}
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource()
.addValue("vm_pool_description", pool.getVmPoolDescription())
+ .addValue("vm_pool_comment", pool.getVmPoolComment())
.addValue("vm_pool_id", pool.getVmPoolId())
.addValue("vm_pool_name", pool.getName())
.addValue("vm_pool_type", pool.getVmPoolType())
@@ -92,6 +93,7 @@
public void update(VmPool pool) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource()
.addValue("vm_pool_description", pool.getVmPoolDescription())
+ .addValue("vm_pool_comment", pool.getVmPoolComment())
.addValue("vm_pool_id", pool.getVmPoolId())
.addValue("vm_pool_name", pool.getName())
.addValue("vm_pool_type", pool.getVmPoolType())
@@ -180,6 +182,8 @@
final VmPool entity = new VmPool();
entity.setVmPoolDescription(rs
.getString("vm_pool_description"));
+ entity.setVmPoolComment(rs
+ .getString("vm_pool_comment"));
entity.setVmPoolId(Guid.createGuidFromString(rs
.getString("vm_pool_id")));
entity.setName(rs.getString("vm_pool_name"));
@@ -204,6 +208,8 @@
final VmPool entity = new VmPool();
entity.setVmPoolDescription(rs
.getString("vm_pool_description"));
+ entity.setVmPoolComment(rs
+ .getString("vm_pool_comment"));
entity.setVmPoolId(Guid.createGuidFromString(rs
.getString("vm_pool_id")));
entity.setName(rs.getString("vm_pool_name"));
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
index d7dec8d..3e20f4b 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
@@ -891,6 +891,9 @@
@DefaultStringValue("Description")
String descriptionPoolGeneral();
+ @DefaultStringValue("Comment")
+ String commentPoolGeneral();
+
@DefaultStringValue("Template")
String templatePoolGeneral();
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/PoolGeneralModelForm.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/PoolGeneralModelForm.java
index 79afd83..bbc5d68 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/PoolGeneralModelForm.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/PoolGeneralModelForm.java
@@ -17,6 +17,7 @@
TextBoxLabel name = new TextBoxLabel();
TextBoxLabel description = new TextBoxLabel();
+ TextBoxLabel comment = new TextBoxLabel();
TextBoxLabel template = new TextBoxLabel();
TextBoxLabel definedMemory = new TextBoxLabel();
TextBoxLabel minAllocatedMemory = new TextBoxLabel();
@@ -38,9 +39,10 @@
formBuilder.setColumnsWidth("120px", "240px", "160px"); //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$
formBuilder.addFormItem(new FormItem(constants.namePoolGeneral(),
name, 0, 0));
formBuilder.addFormItem(new
FormItem(constants.descriptionPoolGeneral(), description, 1, 0));
- formBuilder.addFormItem(new FormItem(constants.templatePoolGeneral(),
template, 2, 0));
- formBuilder.addFormItem(new FormItem(constants.osPoolGeneral(), oS, 3,
0));
- formBuilder.addFormItem(new
FormItem(constants.defaultDisplayTypePoolGeneral(), defaultDisplayType, 4, 0));
+ formBuilder.addFormItem(new FormItem(constants.commentPoolGeneral(),
comment, 2, 0));
+ formBuilder.addFormItem(new FormItem(constants.templatePoolGeneral(),
template, 3, 0));
+ formBuilder.addFormItem(new FormItem(constants.osPoolGeneral(), oS, 4,
0));
+ formBuilder.addFormItem(new
FormItem(constants.defaultDisplayTypePoolGeneral(), defaultDisplayType, 5, 0));
formBuilder.addFormItem(new
FormItem(constants.definedMemPoolGeneral(), definedMemory, 0, 1));
formBuilder.addFormItem(new
FormItem(constants.physMemGaurPoolGeneral(), minAllocatedMemory, 1, 1));
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java
index 5725cf8..ed8c058 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java
@@ -318,6 +318,7 @@
VmPool obj = new VmPool();
obj.setVmPoolDescription(instance.getVmPoolDescription());
+ obj.setVmPoolComment(instance.getVmPoolComment());
obj.setVmPoolId(instance.getVmPoolId());
obj.setName(instance.getName());
obj.setVmPoolType(instance.getVmPoolType());
@@ -330,7 +331,6 @@
obj.setDefaultTimeInDays(instance.getDefaultTimeInDays());
obj.setVdsGroupName(instance.getVdsGroupName());
obj.setAssignedVmsCount(instance.getAssignedVmsCount());
- obj.setVmPoolDescription(instance.getVmPoolDescription());
obj.setRunningVmsCount(instance.getRunningVmsCount());
obj.setPrestartedVms(instance.getPrestartedVms());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java
index 3225fd0..e5c5e53 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java
@@ -94,6 +94,22 @@
}
}
+ private String comment;
+
+ public String getComment()
+ {
+ return comment;
+ }
+
+ public void setComment(String value)
+ {
+ if (!StringHelper.stringsEqual(comment, value))
+ {
+ comment = value;
+ OnPropertyChanged(new PropertyChangedEventArgs("Comment"));
//$NON-NLS-1$
+ }
+ }
+
private String os;
public String getOS()
@@ -435,6 +451,8 @@
setName(pool.getName());
setDescription(pool.getVmPoolDescription());
+ setComment(pool.getVmPoolComment());
+
AsyncQuery _asyncQuery = new AsyncQuery();
_asyncQuery.setModel(this);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
index f4cef73..5f04fcb 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
@@ -313,6 +313,7 @@
model.Initialize(null);
model.getName().setEntity(pool.getName());
model.getDescription().setEntity(pool.getVmPoolDescription());
+ model.getComment().setEntity(pool.getVmPoolComment());
model.getAssignedVms().setEntity(pool.getAssignedVmsCount());
model.getPrestartedVms().setEntity(pool.getPrestartedVms());
model.setPrestartedVmsHint("0-" +
pool.getAssignedVmsCount()); //$NON-NLS-1$
@@ -439,6 +440,7 @@
// Save changes.
pool.setName((String) model.getName().getEntity());
pool.setVmPoolDescription((String)
model.getDescription().getEntity());
+ pool.setVmPoolComment((String)
model.getComment().getEntity());
pool.setVdsGroupId(((VDSGroup)
model.getCluster().getSelectedItem()).getId());
pool.setPrestartedVms(model.getPrestartedVms().AsConvertible().Integer());
@@ -458,6 +460,7 @@
VM desktop = new VM();
+ desktop.setVmComment(""); //$NON-NLS-1$
desktop.setVmtGuid(((VmTemplate)
model.getTemplate().getSelectedItem()).getId());
desktop.setName(name);
desktop.setVmOs((VmOsType)
model.getOSType().getSelectedItem());
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
index 2ba34aa..6fc5475 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
@@ -1420,6 +1420,9 @@
@DefaultStringValue("Description")
String descriptionPool();
+ @DefaultStringValue("Comment")
+ String commentPool();
+
@DefaultStringValue("New")
String newPool();
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabPoolView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabPoolView.java
index 2428bb4..45efdde 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabPoolView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabPoolView.java
@@ -73,6 +73,14 @@
};
getTable().addColumn(descColumn, constants.descriptionPool(),
"300px"); //$NON-NLS-1$
+ TextColumnWithTooltip<VmPool> commentColumn = new
TextColumnWithTooltip<VmPool>() {
+ @Override
+ public String getValue(VmPool object) {
+ return object.getVmPoolComment();
+ }
+ };
+ getTable().addColumn(commentColumn, constants.commentPool(), "300px");
//$NON-NLS-1$
+
getTable().addActionButton(new
WebAdminButtonDefinition<VmPool>(constants.newPool()) {
@Override
protected UICommand resolveCommand() {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolGeneralView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolGeneralView.java
index 451c656..371bec3 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolGeneralView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolGeneralView.java
@@ -35,6 +35,7 @@
TextBoxLabel defaultHost = new TextBoxLabel();
TextBoxLabel definedMemory = new TextBoxLabel();
TextBoxLabel description = new TextBoxLabel();
+ TextBoxLabel comment = new TextBoxLabel();
TextBoxLabel domain = new TextBoxLabel();
TextBoxLabel minAllocatedMemory = new TextBoxLabel();
TextBoxLabel name = new TextBoxLabel();
@@ -75,9 +76,10 @@
formBuilder.setColumnsWidth("115px", "245px", "160px"); //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$
formBuilder.addFormItem(new FormItem(constants.namePoolGeneral(),
name, 0, 0));
formBuilder.addFormItem(new
FormItem(constants.descriptionPoolGeneral(), description, 1, 0));
- formBuilder.addFormItem(new FormItem(constants.templatePoolGeneral(),
template, 2, 0));
- formBuilder.addFormItem(new FormItem(constants.osPoolGeneral(), oS, 3,
0));
- formBuilder.addFormItem(new
FormItem(constants.defaultDisplayTypePoolGeneral(), defaultDisplayType, 4, 0));
+ formBuilder.addFormItem(new FormItem(constants.commentPoolGeneral(),
comment, 2, 0));
+ formBuilder.addFormItem(new FormItem(constants.templatePoolGeneral(),
template, 3, 0));
+ formBuilder.addFormItem(new FormItem(constants.osPoolGeneral(), oS, 4,
0));
+ formBuilder.addFormItem(new
FormItem(constants.defaultDisplayTypePoolGeneral(), defaultDisplayType, 5, 0));
formBuilder.addFormItem(new
FormItem(constants.definedMemPoolGeneral(), definedMemory, 0, 1));
formBuilder.addFormItem(new
FormItem(constants.physMemGaurPoolGeneral(), minAllocatedMemory, 1, 1));
--
To view, visit http://gerrit.ovirt.org/14505
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc24a7ba6b8bbe92429d6e567079d09bc212dcc3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Noam Slomianko <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
