Noam Slomianko has uploaded a new change for review.

Change subject: engine: add comment field to Storage [5]
......................................................................

engine: add comment field to Storage [5]

As part of the Free Text RFE

Added to the entities flow in the system
DB <-> DAO <-> Entity <-> Model <-> UI
DB <-> DAO <-> Entity <-> REST

Change-Id: I0fd8a1b83ed330c945025f13abf565fd899563e7
Signed-off-by: Noam Slomianko <[email protected]>
---
M backend/manager/dbscripts/create_views.sql
M backend/manager/dbscripts/storages_sp.sql
A 
backend/manager/dbscripts/upgrade/03_03_0220_add_comment_storage_domain_static.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 
backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
M 
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java
M 
backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/StorageDomainFieldAutoCompleter.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/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, 80 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/86/15486/1

diff --git a/backend/manager/dbscripts/create_views.sql 
b/backend/manager/dbscripts/create_views.sql
index 4e9454b..5469afb 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.storage_comment as 
storage_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.storage_comment as storage_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,
@@ -271,7 +273,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.storage_comment as storage_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 storage_pool_id, null as storage_pool_name,
@@ -291,7 +293,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.storage_comment as storage_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
@@ -923,6 +925,7 @@
                storage_domain_static.storage,
                storage_domain_static.storage_name,
                storage_domain_static.storage_description as 
storage_description,
+               storage_domain_static.storage_comment as storage_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/storages_sp.sql 
b/backend/manager/dbscripts/storages_sp.sql
index fe264b7..1fc481d 100644
--- a/backend/manager/dbscripts/storages_sp.sql
+++ b/backend/manager/dbscripts/storages_sp.sql
@@ -272,6 +272,7 @@
        v_storage VARCHAR(250),
        v_storage_name VARCHAR(250),
         v_storage_description VARCHAR(4000),
+       v_storage_comment text,
        v_storage_type INTEGER,
        v_storage_domain_type INTEGER,
     v_storage_domain_format_type VARCHAR(50),
@@ -279,8 +280,8 @@
 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_comment, 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_comment, v_storage_type, v_storage_domain_type, 
v_storage_domain_format_type, v_last_time_used_as_master);
 END; $procedure$
 LANGUAGE plpgsql;
 
@@ -302,6 +303,7 @@
        v_storage VARCHAR(250),
        v_storage_name VARCHAR(250),
        v_storage_description VARCHAR(4000),
+       v_storage_comment text,
        v_storage_type INTEGER,
        v_storage_domain_type INTEGER,
        v_storage_domain_format_type INTEGER,
@@ -316,7 +318,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, storage_comment = 
v_storage_comment
       WHERE id = v_id;
 END; $procedure$
 LANGUAGE plpgsql;
diff --git 
a/backend/manager/dbscripts/upgrade/03_03_0220_add_comment_storage_domain_static.sql
 
b/backend/manager/dbscripts/upgrade/03_03_0220_add_comment_storage_domain_static.sql
new file mode 100644
index 0000000..4decdb4
--- /dev/null
+++ 
b/backend/manager/dbscripts/upgrade/03_03_0220_add_comment_storage_domain_static.sql
@@ -0,0 +1 @@
+select fn_db_add_column('storage_domain_static', 'storage_comment', 'text');
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 ed8d109..591afe2 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
@@ -48,6 +48,7 @@
         // Allow change only to name & description field
         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 516175d..ac01ebc 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
@@ -7,7 +7,7 @@
 import org.ovirt.engine.core.compat.Guid;
 import org.ovirt.engine.core.compat.NGuid;
 
-public class StorageDomain extends IVdcQueryable implements 
BusinessEntity<Guid> {
+public class StorageDomain extends IVdcQueryable implements 
BusinessEntity<Guid>, Commented {
     private static final long serialVersionUID = -6162192446628804305L;
 
     public StorageDomain() {
@@ -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..5122587 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;
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 6a349ed..45924ec 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
@@ -146,6 +146,7 @@
             entity.setStorage(rs.getString("storage"));
             entity.setStorageName(rs.getString("storage_name"));
             entity.setDescription(rs.getString("storage_description"));
+            entity.setComment(rs.getString("storage_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..632e104 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
@@ -87,6 +87,7 @@
                 .addValue("storage", domain.getStorage())
                 .addValue("storage_name", domain.getStorageName())
                 .addValue("storage_description", domain.getDescription())
+                .addValue("storage_comment", domain.getComment())
                 .addValue("storage_type", domain.getStorageType())
                 .addValue("storage_domain_type",
                         domain.getStorageDomainType())
@@ -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("storage_comment"));
             entity.setStorageType(StorageType.forValue(rs
                     .getInt("storage_type")));
             entity.setStorageDomainType(StorageDomainType.forValue(rs
diff --git 
a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
 
b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
index f29d8c4..db4769e 100644
--- 
a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
+++ 
b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
@@ -1870,6 +1870,7 @@
           <xs:element name="used" type="xs:long" minOccurs="0"/>
           <xs:element name="committed" type="xs:long" minOccurs="0"/>
           <xs:element name="storage_format" type="xs:string" minOccurs="0"/>
+          <xs:element name="comment" type="xs:string" minOccurs="0" 
maxOccurs="1"/>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
diff --git 
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java
 
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java
index 19927bd..9b06a13 100644
--- 
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java
+++ 
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java
@@ -28,6 +28,9 @@
         if (model.isSetDescription()) {
             entity.setDescription(model.getDescription());
         }
+        if(model.isSetComment()) {
+            entity.setComment(model.getComment());
+        }
         if (model.isSetType()) {
             StorageDomainType storageDomainType = 
StorageDomainType.fromValue(model.getType());
             if (storageDomainType != null) {
@@ -112,6 +115,7 @@
         model.setId(entity.getId().toString());
         model.setName(entity.getStorageName());
         model.setDescription(entity.getDescription());
+        model.setComment(entity.getComment());
         model.setType(map(entity.getStorageDomainType(), null));
         model.setMaster(entity.getStorageDomainType() == 
org.ovirt.engine.core.common.businessentities.StorageDomainType.Master);
         if (entity.getStatus() != null) {
diff --git 
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/StorageDomainFieldAutoCompleter.java
 
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/StorageDomainFieldAutoCompleter.java
index 96f40ac..755e584 100644
--- 
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/StorageDomainFieldAutoCompleter.java
+++ 
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/StorageDomainFieldAutoCompleter.java
@@ -14,6 +14,7 @@
         mVerbs.add("SIZE");
         mVerbs.add("USED");
         mVerbs.add("COMMITTED");
+        mVerbs.add("COMMENT");
 
         // Building the autoCompletion Dict
         buildCompletions();
@@ -25,6 +26,7 @@
         getTypeDictionary().put("SIZE", Integer.class);
         getTypeDictionary().put("USED", Integer.class);
         getTypeDictionary().put("COMMITTED", Integer.class);
+        getTypeDictionary().put("COMMENT", String.class);
 
         // building the ColumnName Dict
         columnNameDict.put("NAME", "storage_name");
@@ -34,6 +36,7 @@
         columnNameDict.put("SIZE", "available_disk_size");
         columnNameDict.put("USED", "used_disk_size");
         columnNameDict.put("COMMITTED", "commited_disk_size");
+        columnNameDict.put("COMMENT", "storage_comment");
 
         // Building the validation dict
         buildBasicValidationTable();
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 192188e..a62bd27 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);
@@ -357,6 +358,7 @@
         model.getHost().setIsChangable(false);
         model.getName().setIsChangable(isStorageEditable);
         model.getDescription().setIsChangable(isStorageEditable);
+        model.getComment().setIsChangable(isStorageEditable);
         //set the field domain type to non editable
         model.getAvailableStorageItems().setIsChangable(false);
         model.setIsChangable(isStorageEditable);
@@ -622,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>();
@@ -1233,6 +1236,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) {
@@ -1493,6 +1497,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)
@@ -1744,6 +1749,7 @@
 
         storageDomain.setStorageName((String) model.getName().getEntity());
         storageDomain.setDescription((String) 
model.getDescription().getEntity());
+        storageDomain.setComment((String) model.getComment().getEntity());
 
         if (isNew)
         {
@@ -1889,6 +1895,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 94926e9..dab381c 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
@@ -114,6 +114,16 @@
         this.description = description;
     }
 
+    private EntityModel comment;
+
+    public EntityModel getComment() {
+        return comment;
+    }
+
+    public void setComment(EntityModel value) {
+        comment = value;
+    }
+
     private ListModel privateDataCenter;
 
     public ListModel getDataCenter()
@@ -198,6 +208,7 @@
 
         setName(new EntityModel());
         setDescription(new EntityModel());
+        setComment(new EntityModel());
         setDataCenterAlert(new EntityModel());
         setDataCenter(new ListModel());
         getDataCenter().getSelectedItemChangedEvent().addListener(this);
@@ -753,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 
SpecialAsciiI18NOrNoneValidation() });
+
+        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/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 8f62ab6..88bdccc 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.commentLabel());
         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..a366c02 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
@@ -46,6 +46,12 @@
                        right: 2px;
                        width: 350px;
                }
+               
+               .commentEditor {
+                       position: absolute;
+                       right: 2px;
+                       width: 350px;
+               }
 
                .formatListEditor {
                        width: 140px;
@@ -90,6 +96,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" addStyleNames="{style.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 da0c27a..2a1511a 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
@@ -24,6 +24,7 @@
 import org.ovirt.engine.ui.webadmin.uicommon.ReportActionsHelper;
 import org.ovirt.engine.ui.webadmin.widget.action.WebAdminButtonDefinition;
 import 
org.ovirt.engine.ui.webadmin.widget.action.WebAdminMenuBarButtonDefinition;
+import org.ovirt.engine.ui.webadmin.widget.table.column.CommentColumn;
 import 
org.ovirt.engine.ui.webadmin.widget.table.column.StorageDomainSharedStatusColumn;
 
 import com.google.gwt.core.client.GWT;
@@ -120,6 +121,8 @@
         };
         getTable().addColumn(descriptionColumn, 
constants.domainDescriptionStorage(), "200px"); //$NON-NLS-1$
 
+        getTable().addColumn(new CommentColumn<StorageDomain>(), 
constants.commentLabel(), "100px"); //$NON-NLS-1$
+
         getTable().addActionButton(new 
WebAdminButtonDefinition<StorageDomain>(constants.newDomainStorage()) {
             @Override
             protected UICommand resolveCommand() {


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0fd8a1b83ed330c945025f13abf565fd899563e7
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

Reply via email to