Skip to content

Commit

Permalink
Some extra work according to @andrepereiradasilva's notes
Browse files Browse the repository at this point in the history
  • Loading branch information
frankmayer committed Dec 13, 2016
1 parent 4ea6fef commit bc7d4dc
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class FinderViewFilter extends JViewLegacy
*
* @var FinderTableFilter
*
* @since 2.5
* @since 3.6.2
*/
protected $filter;

Expand Down Expand Up @@ -57,7 +57,7 @@ class FinderViewFilter extends JViewLegacy
*
* @var integer
*
* @since 2.5
* @since __DEPLOY_VERSION__
*/
protected $total;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@
$userAuthoriseCoreEditState = $user->authorise('core.edit.state', 'com_finder');
$userId = $user->get('id');
foreach ($this->items as $i => $item) :
$canCheckIn = $userAuthoriseCoreManage || $item->checked_out == $userId || $item->checked_out == 0;
$canChange = $userAuthoriseCoreEditState && $canCheckIn;
$escapedTitle = $this->escape($item->title);
?>
$canCheckIn = $userAuthoriseCoreManage || $item->checked_out == $userId || $item->checked_out == 0;
$canChange = $userAuthoriseCoreEditState && $canCheckIn;
$escapedTitle = $this->escape($item->title);
?>
<tr class="row<?php echo $i % 2; ?>">
<td class="center">
<?php echo JHtml::_('grid.id', $i, $item->filter_id); ?>
Expand Down
10 changes: 5 additions & 5 deletions administrator/components/com_finder/views/filters/view.html.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class FinderViewFilters extends JViewLegacy
*
* @var array
*
* @since 2.5
* @since 3.6.1
*/
protected $items;

Expand All @@ -30,7 +30,7 @@ class FinderViewFilters extends JViewLegacy
*
* @var JPagination
*
* @since 2.5
* @since 3.6.1
*/
protected $pagination;

Expand All @@ -39,7 +39,7 @@ class FinderViewFilters extends JViewLegacy
*
* @var string
*
* @since 2.5
* @since 3.6.1
*/
protected $sidebar;

Expand All @@ -48,7 +48,7 @@ class FinderViewFilters extends JViewLegacy
*
* @var mixed
*
* @since 2.5
* @since 3.6.1
*/
protected $state;

Expand All @@ -57,7 +57,7 @@ class FinderViewFilters extends JViewLegacy
*
* @var integer
*
* @since 2.5
* @since 3.6.1
*/
protected $total;

Expand Down
38 changes: 36 additions & 2 deletions components/com_finder/views/search/view.html.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,52 @@
*/
class FinderViewSearch extends JViewLegacy
{
/**
* The query object
*
* @var FinderIndexerQuery
*/
protected $query;

/**
* The application parameters
*
* @var Registry The parameters object
*/
protected $params;

/**
* The model state
*
* @var object
*/
protected $state;

protected $user;

/**
* An array of results
*
* @var array
*
* @since 3.6.1
*/
protected $results;

/**
* The total number of items
*
* @var integer
*
* @since 3.6.1
*/
protected $total;

/**
* The pagination object
*
* @var JPagination
*
* @since __DEPLOY_VERSION__
*/
protected $pagination;

/**
Expand Down

0 comments on commit bc7d4dc

Please sign in to comment.