joomla/patchtester
31
0
Fork 0
mirror of https://github.com/joomla-extensions/patchtester.git synced 2024-06-02 05:30:48 +00:00
Code Issues Releases Activity

Add filter on pull id

Browse Source
This commit is contained in:
Nikolai Plath 2011-10-15 02:10:25 -05:00
parent 1037d7f22d
commit 73abd062d5
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
administrator/components/com_patchtester/models/pulls.php
View File

@ -52,6 +52,9 @@ class PatchtesterModelPulls extends JModelList
$search = $this->getUserStateFromRequest($this->context.'.filter.search', 'filter_search'); $search = $this->getUserStateFromRequest($this->context.'.filter.search', 'filter_search');
$this->setState('filter.search', $search); $this->setState('filter.search', $search);
$searchId = $this->getUserStateFromRequest($this->context.'.filter.searchid', 'filter_searchid');
$this->setState('filter.searchid', $searchId);
// Load the parameters. // Load the parameters.
$params = JComponentHelper::getParams('com_patchtester'); $params = JComponentHelper::getParams('com_patchtester');
@ -102,6 +105,7 @@ class PatchtesterModelPulls extends JModelList
$this->ordering = $this->getState('list.ordering', 'title'); $this->ordering = $this->getState('list.ordering', 'title');
$this->orderDir = $this->getState('list.direction', 'asc'); $this->orderDir = $this->getState('list.direction', 'asc');
$search = $this->getState('filter.search'); $search = $this->getState('filter.search');
$searchId = $this->getState('filter.searchid');
$github = new JGithub(); $github = new JGithub();
$pulls = $github->pulls->getAll($this->getState('github_user'), $this->getState('github_repo')); $pulls = $github->pulls->getAll($this->getState('github_user'), $this->getState('github_repo'));
@ -113,6 +117,10 @@ class PatchtesterModelPulls extends JModelList
unset($pulls[$i]); unset($pulls[$i]);
continue; continue;
} }
if($searchId && $pull->number != $searchId) {
unset($pulls[$i]);
continue;
}
$matches = array(); $matches = array();
preg_match('#\[\#([0-9]+)\]#', $pull->title, $matches); preg_match('#\[\#([0-9]+)\]#', $pull->title, $matches);
$pull->joomlacode_issue = isset($matches[1]) ? $matches[1] : 0; $pull->joomlacode_issue = isset($matches[1]) ? $matches[1] : 0;

15
administrator/components/com_patchtester/views/pulls/tmpl/default.php
View File

@ -25,10 +25,19 @@ $listDirn = $this->escape($this->state->get('list.direction'));
<form action="<?php echo JRoute::_('index.php?option=com_patchtester&view=pulls'); ?>" method="post" name="adminForm" id="adminForm"> <form action="<?php echo JRoute::_('index.php?option=com_patchtester&view=pulls'); ?>" method="post" name="adminForm" id="adminForm">
<fieldset id="filter-bar"> <fieldset id="filter-bar">
<div class="filter-search fltlft"> <div class="filter-search fltlft">
<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label> <strong><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></strong><br />
<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_BANNERS_SEARCH_IN_TITLE'); ?>" /> <label class="filter-search-lbl" for="filter_searchid"><?php echo JText::_('COM_PATCHTESTER_SEARCH_IN_PULL_ID'); ?></label>
<input type="text" name="filter_searchid" id="filter_searchid" size="5"
value="<?php echo $this->escape($this->state->get('filter.searchid')); ?>"
title="<?php echo JText::_('COM_PATCHTESTER_SEARCH_IN_PULL_ID'); ?>" />
<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('COM_PATCHTESTER_SEARCH_IN_TITLE'); ?></label>
<input type="text" name="filter_search" id="filter_search"
value="<?php echo $this->escape($this->state->get('filter.search')); ?>"
title="<?php echo JText::_('COM_PATCHTESTER_SEARCH_IN_TITLE'); ?>" />
<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button> <button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
<button type="button" onclick="document.id('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button> <button type="button" onclick="document.id('filter_search').value='';document.id('filter_searchid').value='';this.form.submit();">
<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?>
</button>
</div> </div>
</fieldset> </fieldset>
<div class="clr"> </div> <div class="clr"> </div>