@@ -52,7 +52,7 @@ |
||
52 | 52 | |
53 | 53 | /** |
54 | 54 | * @return Doctrine\ORM\Query |
55 | - */ |
|
55 | + */ |
|
56 | 56 | public function getQuery() |
57 | 57 | { |
58 | 58 | return $this->data_source->getQuery(); |
@@ -65,7 +65,7 @@ |
||
65 | 65 | return $column; |
66 | 66 | } |
67 | 67 | |
68 | - return current($this->data_source->getRootAliases()) . '.' . $column; |
|
68 | + return current($this->data_source->getRootAliases()).'.'.$column; |
|
69 | 69 | } |
70 | 70 | |
71 | 71 |
@@ -1928,7 +1928,7 @@ |
||
1928 | 1928 | $parent = parent::getParent(); |
1929 | 1929 | if (!$parent instanceof PresenterComponent) { |
1930 | 1930 | throw new DataGridHasToBeAttachedToPresenterComponentException( |
1931 | - "DataGrid is attached to: '" . get_class($parent) . "', but instance of PresenterComponent is needed." |
|
1931 | + "DataGrid is attached to: '".get_class($parent)."', but instance of PresenterComponent is needed." |
|
1932 | 1932 | ); |
1933 | 1933 | } |
1934 | 1934 |
@@ -1757,7 +1757,7 @@ discard block |
||
1757 | 1757 | |
1758 | 1758 | /** |
1759 | 1759 | * Set options of select "items_per_page" |
1760 | - * @param array $items_per_page_list |
|
1760 | + * @param integer[] $items_per_page_list |
|
1761 | 1761 | * @return static |
1762 | 1762 | */ |
1763 | 1763 | public function setItemsPerPageList(array $items_per_page_list, $include_all = TRUE) |
@@ -2064,7 +2064,7 @@ discard block |
||
2064 | 2064 | |
2065 | 2065 | /** |
2066 | 2066 | * Get items detail parameters |
2067 | - * @return array |
|
2067 | + * @return Column\ItemDetail |
|
2068 | 2068 | */ |
2069 | 2069 | public function getItemsDetail() |
2070 | 2070 | { |
@@ -2209,7 +2209,7 @@ discard block |
||
2209 | 2209 | |
2210 | 2210 | |
2211 | 2211 | /** |
2212 | - * @return InlineEdit|null |
|
2212 | + * @return InlineEdit |
|
2213 | 2213 | */ |
2214 | 2214 | public function getInlineEdit() |
2215 | 2215 | { |
@@ -10,7 +10,6 @@ |
||
10 | 10 | |
11 | 11 | use Nette\Utils\Html; |
12 | 12 | use Ublaboo\DataGrid\DataGrid; |
13 | -use Ublaboo\DataGrid\Exception\DataGridHasToBeAttachedToPresenterComponentException; |
|
14 | 13 | use Ublaboo\DataGrid\Exception\DataGridException; |
15 | 14 | use Ublaboo\DataGrid\Row; |
16 | 15 |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | /** |
186 | 186 | * Set icon |
187 | 187 | * @param string|callable $icon |
188 | - * @return static|callable |
|
188 | + * @return Action |
|
189 | 189 | * @throws DataGridException |
190 | 190 | */ |
191 | 191 | public function setIcon($icon) |
@@ -270,7 +270,8 @@ discard block |
||
270 | 270 | |
271 | 271 | /** |
272 | 272 | * Check whether given property is string or callable |
273 | - * @param mixed $property |
|
273 | + * @param callable $property |
|
274 | + * @param string $name |
|
274 | 275 | * @return void |
275 | 276 | * @throws DataGridException |
276 | 277 | */ |
@@ -10,7 +10,6 @@ |
||
10 | 10 | |
11 | 11 | use Nette\Utils\Html; |
12 | 12 | use Ublaboo\DataGrid\DataGrid; |
13 | -use Ublaboo\DataGrid\Exception\DataGridHasToBeAttachedToPresenterComponentException; |
|
14 | 13 | use Ublaboo\DataGrid\Exception\DataGridException; |
15 | 14 | use Ublaboo\DataGrid\Row; |
16 | 15 |
@@ -90,7 +90,7 @@ |
||
90 | 90 | ]); |
91 | 91 | |
92 | 92 | if ($this->icon) { |
93 | - $a->add(Html::el('span')->class(DataGrid::$icon_prefix . $this->icon)); |
|
93 | + $a->add(Html::el('span')->class(DataGrid::$icon_prefix.$this->icon)); |
|
94 | 94 | |
95 | 95 | if (strlen($this->text)) { |
96 | 96 | $a->add(' '); |
@@ -8,7 +8,6 @@ |
||
8 | 8 | |
9 | 9 | namespace Ublaboo\DataGrid; |
10 | 10 | |
11 | -use Nette; |
|
12 | 11 | use DibiFluent; |
13 | 12 | use DibiOdbcDriver; |
14 | 13 | use DibiMsSqlDriver; |
@@ -9,7 +9,6 @@ |
||
9 | 9 | namespace Ublaboo\DataGrid\DataSource; |
10 | 10 | |
11 | 11 | use DibiFluent; |
12 | -use Nette\Utils\Callback; |
|
13 | 12 | use Nette\Utils\Strings; |
14 | 13 | use Ublaboo\DataGrid\Filter; |
15 | 14 |
@@ -8,9 +8,7 @@ |
||
8 | 8 | |
9 | 9 | namespace Ublaboo\DataGrid\DataSource; |
10 | 10 | |
11 | -use DibiFluent; |
|
12 | 11 | use Nette\Utils\Callback; |
13 | -use Nette\Utils\Strings; |
|
14 | 12 | use Ublaboo\DataGrid\Filter; |
15 | 13 | |
16 | 14 | abstract class FilterableDataSource |
@@ -197,7 +197,7 @@ |
||
197 | 197 | * Apply fitler date and tell whether row value matches or not |
198 | 198 | * @param mixed $row |
199 | 199 | * @param Filter $filter |
200 | - * @return mixed |
|
200 | + * @return boolean|null |
|
201 | 201 | */ |
202 | 202 | protected function applyFilterDate($row, FilterDate $filter) |
203 | 203 | { |
@@ -10,9 +10,7 @@ |
||
10 | 10 | |
11 | 11 | use Ublaboo\DataGrid\Filter\Filter; |
12 | 12 | use Ublaboo\DataGrid\Filter\FilterDate; |
13 | -use Nette\Utils\Callback; |
|
14 | 13 | use Nette\Utils\Strings; |
15 | -use Ublaboo\DataGrid\Exception\DataGridException; |
|
16 | 14 | use Ublaboo\DataGrid\Exception\DataGridArrayDataSourceException; |
17 | 15 | use Ublaboo\DataGrid\Utils\DateTimeHelper; |
18 | 16 | use Ublaboo\DataGrid\Exception\DataGridDateTimeHelperException; |
@@ -60,7 +60,7 @@ |
||
60 | 60 | } |
61 | 61 | |
62 | 62 | return $this->data_source->count( |
63 | - $this->data_source->getName() . '.' . (is_array($primary) ? reset($primary) : $primary) |
|
63 | + $this->data_source->getName().'.'.(is_array($primary) ? reset($primary) : $primary) |
|
64 | 64 | ); |
65 | 65 | } |
66 | 66 |