claunia/qemudb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

filter_ui: Improve display of filters with only one operator

Browse Source
This commit is contained in:
Alexander Nicolaysen Sørnes
2008-06-13 23:18:07 +02:00
committed by Chris Morgan
parent 0a305197fd
commit 7a138bd2c2
1 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
include/db_filter_ui.php
View File

@@ -165,32 +165,45 @@ class FilterInterface
$oColumn = $this->aFilterInfo[$oFilter->getColumn()];
$sId = ($iId == -1) ? '' : $iId;
$shEditor = $oColumn->getDisplayName();
$shEditor = $oColumn->getDisplayName().' ';
$shEditor .= " <select name='i{$sColumn}Op$sId'>";
$aTypes = $oColumn->getTypes();
if($iId == -1)
/* It doesn't make sense to show a dropdown menu of choices if there is only one
If the filter is already active then there are more than one; one to remove */
if($iId == -1 && sizeof($aTypes) == 1)
{
$sText = 'select';
$sSel = " selected='selected'";
echo "<input type=\"hidden\" name=\"i{$sColumn}Op$sId\" value=\"{$aTypes[0]}\" />";
/* Printing 'equal to' sounds weird if it is the only choice */
if($aTypes[0] != FILTER_EQUALS)
$shEditor .= $oColumn->getOpName($aTypes[0]);
} else
{
$sSel = '';
$sText = 'remove';
}
$shEditor .= "<select name='i{$sColumn}Op$sId'>";
$shEditor .= "<option value='0'$sSel>-- $sText --</option>";
foreach($oColumn->getTypes() as $iType)
{
if($oFilter->getOperatorId() == $iType)
if($iId == -1)
{
$sText = 'select';
$sSel = " selected='selected'";
else
} else
{
$sSel = '';
$shEditor .= "<option value='$iType'$sSel>".$oColumn->getOpName($iType).'</option><br />';
}
$sText = 'remove';
}
$shEditor .= '</select> ';
$shEditor .= "<option value='0'$sSel>-- $sText --</option>";
foreach($aTypes as $iType)
{
if($oFilter->getOperatorId() == $iType)
$sSel = " selected='selected'";
else
$sSel = '';
$shEditor .= "<option value='$iType'$sSel>".$oColumn->getOpName($iType).'</option><br />';
}
$shEditor .= '</select> ';
}
switch($oColumn->getValueType())
{
@@ -344,7 +357,7 @@ class FilterInterface
$sData = $aClean["s{$sColumn}Data"];
$iOp = $aClean["i{$sColumn}Op"];
if($iOp)
if($iOp && $sData)
{
$oFilter = new Filter($oOption->getColumn(), $iOp, $sData);
$aReturn[] = $oFilter;