Noam Slomianko has uploaded a new change for review.

Change subject: engine: engine: add comment field to storage domain
......................................................................

engine: engine: add comment field to storage domain

Part of the adding a comment field to many parts of the system

- added coloumn in storage_domain_static
- changed views accordingly
- changed doa
- added comment to StorageDomain, StorageDomainStatic
- added comment to  StorageModel, StorageModelList
- reflected changes in the UI

Change-Id: Id946f079406f6d1ec3951499276093f68b3b5250
Bug-Url: https://bugzilla.redhat.com/610501
Signed-off-by: Noam Slomianko <nslom...@redhat.com>
---
M backend/manager/dbscripts/create_views.sql
M backend/manager/dbscripts/inst_sp.sql
M backend/manager/dbscripts/storages_sp.sql
A backend/manager/dbscripts/upgrade/03_02_0520_add_comment_storage_domain.sql
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageDomainCommand.java
M 
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
M 
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java
M 
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java
M 
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainStaticDAODbFacadeImpl.java
M 
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.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/popup/storage/StoragePopupView.java
M 
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.ui.xml
M 
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabStorageView.java
16 files changed, 83 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/31/14131/1

diff --git a/backend/manager/dbscripts/create_views.sql 
b/backend/manager/dbscripts/create_views.sql
index 560fd17..9b9a7e6 100644
--- a/backend/manager/dbscripts/create_views.sql
+++ b/backend/manager/dbscripts/create_views.sql
@@ -9,6 +9,7 @@
                        storage_domain_static.storage as storage,
                        storage_domain_static.storage_name as storage_name,
                        storage_domain_static.storage_description as 
storage_description,
+                       storage_domain_static.comment as comment,
                        storage_pool_iso_map.storage_pool_id as storage_pool_id,
                         storage_pool_iso_map.status as status,
                        storage_domain_static.storage_domain_type as 
storage_domain_type,
@@ -247,6 +248,7 @@
                storage_domain_static.storage as storage,
                storage_domain_static.storage_name as storage_name,
                storage_domain_static.storage_description as 
storage_description,
+               storage_domain_static.comment as comment,
         storage_pool_iso_map.storage_pool_id as storage_pool_id,
                storage_domain_dynamic.available_disk_size as 
available_disk_size,
                storage_domain_dynamic.used_disk_size as used_disk_size,
@@ -272,7 +274,7 @@
 AS
 SELECT DISTINCT
 storage_domain_static.id as id, storage_domain_static.storage as storage, 
storage_domain_static.storage_name as storage_name, 
storage_domain_static.storage_description as storage_description,
-               storage_domain_static.storage_type as storage_type, 
storage_domain_static.storage_domain_type as storage_domain_type,
+               storage_domain_static.comment as comment, 
storage_domain_static.storage_type as storage_type, 
storage_domain_static.storage_domain_type as storage_domain_type,
                 storage_domain_static.storage_domain_format_type as 
storage_domain_format_type,
         storage_domain_static.last_time_used_as_master as 
last_time_used_as_master,
                null as owner, null as storage_pool_id, null as 
storage_pool_name,
@@ -292,7 +294,7 @@
 AS
 SELECT
                 storage_domain_static.id as id, storage_domain_static.storage 
as storage, storage_domain_static.storage_name as storage_name, 
storage_domain_static.storage_description as storage_description,
-                storage_domain_static.storage_type as storage_type, 
storage_domain_static.storage_domain_type as storage_domain_type,
+                storage_domain_static.comment as comment, 
storage_domain_static.storage_type as storage_type, 
storage_domain_static.storage_domain_type as storage_domain_type,
                 storage_domain_static.storage_domain_format_type as 
storage_domain_format_type,
                 storage_domain_static.last_time_used_as_master as 
last_time_used_as_master,
                 CASE
@@ -928,6 +930,7 @@
                storage_domain_static.storage,
                storage_domain_static.storage_name,
                storage_domain_static.storage_description as 
storage_description,
+               storage_domain_static.comment as comment,
                storage_domain_dynamic.available_disk_size,
                storage_domain_dynamic.used_disk_size,
                fn_get_disk_commited_value_by_storage(storage_domain_static.id) 
as commited_disk_size,
diff --git a/backend/manager/dbscripts/inst_sp.sql 
b/backend/manager/dbscripts/inst_sp.sql
index a4dcd20..37e2980 100644
--- a/backend/manager/dbscripts/inst_sp.sql
+++ b/backend/manager/dbscripts/inst_sp.sql
@@ -28,7 +28,7 @@
         -- Insert storage server connection info
         perform 
Insertstorage_server_connections(v_connection,cast(v_connection_id as 
varchar(250)),NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL);
         -- Insert storage domain static info
-        perform 
Insertstorage_domain_static(v_storage_domain_id,cast(v_connection_id as 
varchar(250)),v_name,v_name,1,2,'0',0);
+        perform 
Insertstorage_domain_static(v_storage_domain_id,cast(v_connection_id as 
varchar(250)),v_name,v_name,1,2,'0',0,'');
         -- Insert storage domain dynamic  info
         perform 
Insertstorage_domain_dynamic(v_available,v_storage_domain_id,v_used);
     end if;
diff --git a/backend/manager/dbscripts/storages_sp.sql 
b/backend/manager/dbscripts/storages_sp.sql
index 2860194..437a77b 100644
--- a/backend/manager/dbscripts/storages_sp.sql
+++ b/backend/manager/dbscripts/storages_sp.sql
@@ -277,12 +277,13 @@
        v_storage_type INTEGER,
        v_storage_domain_type INTEGER,
     v_storage_domain_format_type VARCHAR(50),
-    v_last_time_used_as_master BIGINT)
+    v_last_time_used_as_master BIGINT,
+    v_comment VARCHAR(4000))
 RETURNS VOID
    AS $procedure$
    BEGIN
-INSERT INTO storage_domain_static(id, storage,storage_name, 
storage_description, storage_type, storage_domain_type, 
storage_domain_format_type, last_time_used_as_master)
-       VALUES(v_id, v_storage, v_storage_name, v_storage_description, 
v_storage_type, v_storage_domain_type, v_storage_domain_format_type, 
v_last_time_used_as_master);
+INSERT INTO storage_domain_static(id, storage,storage_name, 
storage_description, storage_type, storage_domain_type, 
storage_domain_format_type, last_time_used_as_master, comment)
+       VALUES(v_id, v_storage, v_storage_name, v_storage_description, 
v_storage_type, v_storage_domain_type, v_storage_domain_format_type, 
v_last_time_used_as_master, v_comment);
 END; $procedure$
 LANGUAGE plpgsql;
 
@@ -307,7 +308,8 @@
        v_storage_type INTEGER,
        v_storage_domain_type INTEGER,
        v_storage_domain_format_type INTEGER,
-       v_last_time_used_as_master BIGINT)
+       v_last_time_used_as_master BIGINT,
+       v_comment VARCHAR(4000))
 RETURNS VOID
 
        --The [storage_domain_static] table doesn't have a timestamp column. 
Optimistic concurrency logic cannot be generated
@@ -318,7 +320,7 @@
       storage_domain_type = v_storage_domain_type, _update_date = 
LOCALTIMESTAMP,
       storage_domain_format_type = v_storage_domain_format_type,
       last_time_used_as_master = v_last_time_used_as_master,
-      storage_description = v_storage_description
+      storage_description = v_storage_description, comment=v_comment
       WHERE id = v_id;
 END; $procedure$
 LANGUAGE plpgsql;
diff --git 
a/backend/manager/dbscripts/upgrade/03_02_0520_add_comment_storage_domain.sql 
b/backend/manager/dbscripts/upgrade/03_02_0520_add_comment_storage_domain.sql
new file mode 100644
index 0000000..39ead57
--- /dev/null
+++ 
b/backend/manager/dbscripts/upgrade/03_02_0520_add_comment_storage_domain.sql
@@ -0,0 +1 @@
+select fn_db_add_column('storage_domain_static', 'comment', 'VARCHAR(4000) NOT 
NULL default ''''');
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageDomainCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageDomainCommand.java
index 80740df..3d3d92f 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageDomainCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageDomainCommand.java
@@ -45,9 +45,10 @@
         List<String> props = ObjectIdentityChecker.GetChangedFields(oldDomain, 
getStorageDomain()
                 .getStorageStaticData());
 
-        // Allow change only to name & description field
+        // Allow change only to name, comment & description fields
         props.remove("storageName");
         props.remove("description");
+        props.remove("comment");
         if (returnValue && props.size() > 0) {
             log.warnFormat("There was an attempt to update the following 
fields although they are not allowed to be updated: {0}",
                     StringUtils.join(props, ","));
diff --git 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
index 3322486..bdcd242 100644
--- 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
+++ 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
@@ -128,6 +128,14 @@
         getStorageStaticData().setDescription(description);
     }
 
+    public String getComment() {
+        return getStorageStaticData().getComment();
+    }
+
+    public void setComment(String value) {
+        getStorageStaticData().setComment(value);
+    }
+
     public NGuid getStoragePoolId() {
         return getStoragePoolIsoMapData().getstorage_pool_id();
     }
diff --git 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java
 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java
index 8fdffb7..f215be1 100644
--- 
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java
+++ 
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java
@@ -29,6 +29,8 @@
             groups = { CreateEntity.class, UpdateEntity.class })
     private String description;
 
+    private String comment;
+
     private StorageDomainType storageType = StorageDomainType.Master;
 
     private StorageType storagePoolType = StorageType.UNKNOWN;
@@ -144,6 +146,14 @@
         this.description = description;
     }
 
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String value) {
+        comment = value;
+    }
+
     @Override
     public int hashCode() {
         final int prime = 31;
@@ -157,6 +167,7 @@
         result = prime * result + ((storagePoolType == null) ? 0 : 
storagePoolType.hashCode());
         result = prime * result + ((storageType == null) ? 0 : 
storageType.hashCode());
         result = prime * result + ((description == null) ? 0 : 
description.hashCode());
+        result = prime * result + ((comment == null) ? 0 : comment.hashCode());
         return result;
     }
 
diff --git 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java
 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java
index e6a1a1e..aa83b35 100644
--- 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java
+++ 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDAODbFacadeImpl.java
@@ -137,6 +137,7 @@
             entity.setStorage(rs.getString("storage"));
             entity.setStorageName(rs.getString("storage_name"));
             entity.setDescription(rs.getString("storage_description"));
+            entity.setComment(rs.getString("comment"));
             
entity.setStoragePoolId(NGuid.createGuidFromString(rs.getString("storage_pool_id")));
             
entity.setStorageType(StorageType.forValue(rs.getInt("storage_type")));
             entity.setStoragePoolName(rs.getString("storage_pool_name"));
diff --git 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainStaticDAODbFacadeImpl.java
 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainStaticDAODbFacadeImpl.java
index 8517ce4..d6785ad 100644
--- 
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainStaticDAODbFacadeImpl.java
+++ 
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainStaticDAODbFacadeImpl.java
@@ -91,7 +91,8 @@
                 .addValue("storage_domain_type",
                         domain.getStorageDomainType())
                 .addValue("storage_domain_format_type", 
domain.getStorageFormat())
-                .addValue("last_time_used_as_master", 
domain.getLastTimeUsedAsMaster());
+                .addValue("last_time_used_as_master", 
domain.getLastTimeUsedAsMaster())
+                .addValue("comment", domain.getComment());
     }
 
     @Override
@@ -110,6 +111,7 @@
             entity.setStorage(rs.getString("storage"));
             entity.setStorageName(rs.getString("storage_name"));
             entity.setDescription(rs.getString("storage_description"));
+            entity.setComment(rs.getString("comment"));
             entity.setStorageType(StorageType.forValue(rs
                     .getInt("storage_type")));
             entity.setStorageDomainType(StorageDomainType.forValue(rs
diff --git 
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
 
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
index b15becc..374b85a 100644
--- 
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
+++ 
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
@@ -1123,7 +1123,7 @@
     @DefaultStringValue("Cannot extend Storage Domain. Storage device ${lun} 
is unreachable from ${hostName}.")
     String ERROR_CANNOT_EXTEND_CONNECTION_FAILED();
 
-    @DefaultStringValue("Cannot ${action} ${type}. Only Storage Domain name is 
updateable.")
+    @DefaultStringValue("Cannot ${action} ${type}. Only Storage Domain name or 
comment is updateable.")
     String ERROR_CANNOT_CHANGE_STORAGE_DOMAIN_FIELDS();
 
     @DefaultStringValue("Cannot update Data Center compatibility version to a 
value that is greater than its Cluster's version. The following clusters should 
be upgraded ${ClustersList}.")
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
index 6941b5d..685b531 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
@@ -348,6 +348,7 @@
         model.setStorage(storage);
         model.getName().setEntity(storage.getStorageName());
         model.getDescription().setEntity(storage.getDescription());
+        model.getComment().setEntity(storage.getComment());
         model.setOriginalName(storage.getStorageName());
 
         model.getDataCenter().setIsChangable(false);
@@ -623,6 +624,7 @@
         model.setSystemTreeSelectedItem(getSystemTreeSelectedItem());
         model.getName().setIsAvailable(false);
         model.getDescription().setIsAvailable(false);
+        model.getComment().setIsAvailable(false);
         model.getFormat().setIsAvailable(false);
 
         ArrayList<IStorageModel> items = new ArrayList<IStorageModel>();
@@ -1210,6 +1212,7 @@
         storageDomain.setStorageDomainType(isNew ? storageModel.getRole() : 
storageDomain.getStorageDomainType());
         storageDomain.setStorageName((String) model.getName().getEntity());
         storageDomain.setDescription((String) 
model.getDescription().getEntity());
+        storageDomain.setComment((String) model.getComment().getEntity());
         storageDomain.setStorageFormat((StorageFormatType) 
model.getFormat().getSelectedItem());
 
         if (isNew) {
@@ -1470,6 +1473,7 @@
 
         storageDomain.setStorageName((String) model.getName().getEntity());
         storageDomain.setDescription((String) 
model.getDescription().getEntity());
+        storageDomain.setComment((String) model.getComment().getEntity());
         storageDomain.setStorageFormat((StorageFormatType) 
model.getFormat().getSelectedItem());
 
         if (isNew)
@@ -1721,6 +1725,7 @@
 
         storageDomain.setStorageName((String) model.getName().getEntity());
         storageDomain.setDescription((String) 
model.getDescription().getEntity());
+        storageDomain.setComment((String) model.getComment().getEntity());
 
         if (isNew)
         {
@@ -1866,6 +1871,7 @@
 
         storageDomain.setStorageName((String) model.getName().getEntity());
         storageDomain.setDescription((String) 
model.getDescription().getEntity());
+        storageDomain.setComment((String) model.getComment().getEntity());
 
         if (isNew)
         {
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
index 8a58782..01aa169 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
@@ -37,6 +37,7 @@
 import org.ovirt.engine.ui.uicommonweb.models.ListModel;
 import org.ovirt.engine.ui.uicommonweb.models.SystemTreeItemModel;
 import org.ovirt.engine.ui.uicommonweb.models.SystemTreeItemType;
+import org.ovirt.engine.ui.uicommonweb.validation.AsciiOrNoneValidation;
 import org.ovirt.engine.ui.uicommonweb.validation.IValidation;
 import org.ovirt.engine.ui.uicommonweb.validation.LengthValidation;
 import org.ovirt.engine.ui.uicommonweb.validation.NotEmptyValidation;
@@ -112,6 +113,16 @@
 
     public void setDescription(EntityModel description) {
         this.description = description;
+    }
+
+    private EntityModel comment;
+
+    public EntityModel getComment() {
+        return comment;
+    }
+
+    public void setComment(EntityModel value) {
+        this.comment = value;
     }
 
     private ListModel privateDataCenter;
@@ -199,6 +210,7 @@
         setName(new EntityModel());
         setDescription(new EntityModel());
         setDataCenterAlert(new EntityModel());
+        setComment(new EntityModel());
         setDataCenter(new ListModel());
         getDataCenter().getSelectedItemChangedEvent().addListener(this);
         setHost(new ListModel());
@@ -752,7 +764,10 @@
                 new 
LengthValidation(BusinessEntitiesDefinitions.GENERAL_MAX_SIZE),
                 new SpecialAsciiI18NOrNoneValidation() });
 
-        return getName().getIsValid() && getHost().getIsValid() && 
getIsValid() && getSelectedItem().Validate() && getDescription().getIsValid();
+        getComment().ValidateEntity(new IValidation[] { new 
AsciiOrNoneValidation() });
+
+        return getName().getIsValid() && getHost().getIsValid() && 
getIsValid() && getSelectedItem().Validate()
+                && getDescription().getIsValid() && getComment().getIsValid();
     }
 
     private SystemTreeItemModel privateSystemTreeSelectedItem;
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 eef001c..97bb0f7 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
@@ -217,6 +217,9 @@
     @DefaultStringValue("Description")
     String storagePopupDescriptionLabel();
 
+    @DefaultStringValue("Comment")
+    String storagePopupCommentLabel();
+
     @DefaultStringValue("Data Center")
     String storagePopupDataCenterLabel();
 
@@ -1186,6 +1189,9 @@
     @DefaultStringValue("Description")
     String domainDescriptionStorage();
 
+    @DefaultStringValue("Comment")
+    String domainCommentStorage();
+
     @DefaultStringValue("Domain Type")
     String domainTypeStorage();
 
diff --git 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.java
 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.java
index 6193d66..0129723 100644
--- 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.java
+++ 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.java
@@ -62,6 +62,11 @@
     @WithElementId("description")
     EntityModelTextBoxEditor descriptionEditor;
 
+    @UiField
+    @Path(value = "comment.entity")
+    @WithElementId("comment")
+    EntityModelTextBoxEditor commentEditor;
+
     @UiField(provided = true)
     @Path(value = "dataCenter.selectedItem")
     @WithElementId("dataCenter")
@@ -178,6 +183,7 @@
     void localize(ApplicationConstants constants) {
         nameEditor.setLabel(constants.storagePopupNameLabel());
         descriptionEditor.setLabel(constants.storagePopupDescriptionLabel());
+        commentEditor.setLabel(constants.storagePopupCommentLabel());
         datacenterListEditor.setLabel(constants.storagePopupDataCenterLabel());
         
storageTypeListEditor.setLabel(constants.storagePopupStorageTypeLabel());
         formatListEditor.setLabel(constants.storagePopupFormatTypeLabel());
diff --git 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.ui.xml
 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.ui.xml
index a28b3c6..4cb813a 100644
--- 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.ui.xml
+++ 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.ui.xml
@@ -90,6 +90,7 @@
                                <g:HorizontalPanel>
                                        <e:ListModelListBoxEditor 
ui:field="datacenterListEditor" addStyleNames="{style.datacenterListEditor}"/>
                                        <g:Image ui:field="datacenterAlertIcon" 
resource='{resources.alertImage}' visible="false" 
addStyleNames="{style.dataCenterAlertIcon}"/>
+                                       <e:EntityModelTextBoxEditor 
ui:field="commentEditor" />
                                </g:HorizontalPanel>
                                <g:HorizontalPanel 
addStyleNames="{style.storageTypePanel}">
                                        <e:ListModelListBoxEditor 
ui:field="storageTypeListEditor" addStyleNames="{style.storageTypeListEditor}"/>
diff --git 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabStorageView.java
 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabStorageView.java
index f5f6478..deef537 100644
--- 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabStorageView.java
+++ 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabStorageView.java
@@ -111,6 +111,14 @@
         };
         getTable().addColumn(descriptionColumn, 
constants.domainDescriptionStorage(), "200px"); //$NON-NLS-1$
 
+        TextColumnWithTooltip<StorageDomain> commentColumn = new 
TextColumnWithTooltip<StorageDomain>() {
+            @Override
+            public String getValue(StorageDomain object) {
+                return object.getComment();
+            }
+        };
+        getTable().addColumn(commentColumn, constants.domainCommentStorage(), 
"200px"); //$NON-NLS-1$
+
         getTable().addActionButton(new 
WebAdminButtonDefinition<StorageDomain>(constants.newDomainStorage()) {
             @Override
             protected UICommand resolveCommand() {


--
To view, visit http://gerrit.ovirt.org/14131
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id946f079406f6d1ec3951499276093f68b3b5250
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Noam Slomianko <nslom...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to