Просмотр исходного кода

Ticket #367 - Related changes in core files.

AntonLV 10 лет назад
Родитель
Сommit
30a9ddcaa5
2 измененных файлов с 20 добавлено и 11 удалено
  1. 12 10
      template/grid.html
  2. 8 1
      template/scripts/BxBaseGrid.php

+ 12 - 10
template/grid.html

@@ -24,16 +24,18 @@
         <hr class="bx-def-hr" />
 
         <table id="__id_table__" class="bx-grid-table">
-            <thead>
-                <tr>
-                    <bx_repeat:row_header>
-                        __header_cell__
-                    </bx_repeat:row_header>
-                </tr>
-                <tr class="bx-grid-table-row-hr">
-                    <td colspan="__columns__"><hr class="bx-def-hr" /></td>
-                </tr>
-            </thead>            
+        	<bx_if:display_head>
+	            <thead>
+	                <tr>
+	                    <bx_repeat:row_header>
+	                        __header_cell__
+	                    </bx_repeat:row_header>
+	                </tr>
+	                <tr class="bx-grid-table-row-hr">
+	                    <td colspan="__columns__"><hr class="bx-def-hr" /></td>
+	                </tr>
+	            </thead>
+            </bx_if:display_head>
             <tbody>
                     <bx_repeat:rows_data>
                         <tr id="__id_row__" class="__row_class__">

+ 8 - 1
template/scripts/BxBaseGrid.php

@@ -176,6 +176,8 @@ class BxBaseGrid extends BxDolGrid
         if (!empty($this->_aConfirmMessages) && is_array($this->_aConfirmMessages))
             $sConfirmMessages = json_encode($this->_aConfirmMessages);
 
+		$aVarsHead = $this->_getRowHeader();
+
         $aVars = array (
             'object' => $this->_sObject,
             'id_table' => $sIdTable,
@@ -185,7 +187,12 @@ class BxBaseGrid extends BxDolGrid
             'sorting' => empty($this->_aOptions['sorting_fields']) ? 0 : 1,
             'sorting_field' => $sOrderField,
             'sorting_dir' => $sOrderDir,
-            'bx_repeat:row_header' => $this->_getRowHeader (),
+        	'bx_if:display_head' => array(
+        		'condition' => !empty($aVarsHead),
+        		'content' => array(
+        			'bx_repeat:row_header' => $aVarsHead
+        		)
+        	),
             'bx_repeat:rows_data' => $this->_getRowsDataDesign ($aData),
             'paginate' => $sPaginate,
             'paginate_get_start' => $this->_aOptions['paginate_get_start'],