Merge branch 'master' of https://github.com/contributte/datagrid

contributte · May 27, 2019 · f527403 · f527403
2 parents 6e52a5a + 4ddfec9
commit f527403
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/Column/ColumnStatus.php b/src/Column/ColumnStatus.php
@@ -10,6 +10,7 @@
 use Ublaboo\DataGrid\Row;
 use Ublaboo\DataGrid\Status\Option;
 use Ublaboo\DataGrid\Traits\TButtonCaret;
+use Ublaboo\DataGrid\Traits\TRenderCondition;
 
 /**
  * @method onChange(string $id, string $value)
@@ -19,6 +20,7 @@ class ColumnStatus extends Column
 
 	use TButtonCaret;
 	use SmartObject;
+	use TRenderCondition;
 
 	/**
 	 * @var array|callable[]

diff --git a/src/templates/column_status.latte b/src/templates/column_status.latte
@@ -7,10 +7,14 @@
 
 <div class="dropdown">
 	{if $activeOption}
-		<button class="dropdown-toggle {$activeOption->getClass()} {$activeOption->getClassSecondary()}" type="button" data-toggle="dropdown">
-			{if $activeOption->getIcon()}<i class="{$iconPrefix}{$activeOption->getIcon()}"></i> {/if}
-			{$activeOption->getText()|translate} <i n:if="$status->hasCaret()" class="caret"></i>
-		</button>
+		{if $status->shouldBeRendered($row)}
+			<button class="dropdown-toggle {$activeOption->getClass()} {$activeOption->getClassSecondary()}" type="button" data-toggle="dropdown">
+				{if $activeOption->getIcon()}<i class="{$iconPrefix}{$activeOption->getIcon()}"></i> {/if}
+				{$activeOption->getText()|translate} <i n:if="$status->hasCaret()" class="caret"></i>
+			</button>
+		{else}
+			{$active_option->getText()|translate}
+		{/if}
 	{else}
 		{$row->getValue($status->getColumn())}
 	{/if}

diff --git a/src/templates/datagrid.latte b/src/templates/datagrid.latte
@@ -38,8 +38,8 @@
 					<div class="{$filter_row_class}" id="datagrid-{$control->getFullName()}-row-filters">
 						<div class="row">
 							{var $i = 0}
-							{var $filter_columns_class = 'col-sm-' . (12 / $control->getOuterFilterColumnsCount())}
-							<div class="{$filter_columns_class}" n:foreach="$filters as $f">
+							{var $filterColumnsClass = 'col-sm-' . (12 / $control->getOuterFilterColumnsCount())}
+							<div class="datagrid-row-outer-filters-group {$filterColumnsClass}" n:foreach="$filters as $f">
 								{**
 								 * Each fitler is rendered separately in its own template
 								 *}