Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!2386

o2web/source/x_component_process_ProcessManager/DictionaryExplorer.js

@@ -251,6 +251,10 @@ MWF.xApplication.process.ProcessManager.DictionaryExplorer = new Class({
                     }.bind(this));
                 }
             }
+            if( !this.isSetContentSize ){
+                this.setContentSize();
+                this.isSetContentSize = true;
+            }
         }.bind(this));
     },
     deleteItems: function(){

o2web/source/x_component_process_ProcessManager/Explorer.js

@@ -180,10 +180,12 @@ MWF.xApplication.process.ProcessManager.Explorer = new Class({
         if (this.elementContentListNode){
             var toolbarSize = (this.toolbarNode) ? this.toolbarNode.getSize() : {"x": 0, "y": 0};
             var nodeSize = (this.node) ? this.node.getSize() : {"x": 0, "y": 0};
+            var categorySize = this.categoryElementNode ? this.categoryElementNode.getSize() : {"x": 0, "y": 0};
+
             var pt = this.elementContentNode.getStyle("padding-top").toFloat();
             var pb = this.elementContentNode.getStyle("padding-bottom").toFloat();
 
-            var height = nodeSize.y-toolbarSize.y-pt-pb;
+            var height = nodeSize.y-toolbarSize.y-categorySize.y-pt-pb;
             this.elementContentNode.setStyle("height", ""+height+"px");
 
             var count = (nodeSize.x/282).toInt();
@@ -226,6 +228,10 @@ MWF.xApplication.process.ProcessManager.Explorer = new Class({
                 }.bind(this));
             }
             this.loadCategoryList();
+            if( !this.isSetContentSize ){
+                this.setContentSize();
+                this.isSetContentSize = true;
+            }
         }.bind(this));
     },
     loadCategoryList: function(){