Changed filter list order back to Name

Added extra argument 'Id' to delete button onClick call
This commit is contained in:
bhaal2 2016-09-15 01:55:58 +10:00
parent cd626a54ee
commit 67f2ddc404
1 changed files with 2 additions and 2 deletions

View File

@ -24,7 +24,7 @@ if ( !canView( 'Events' ) ) {
} }
$selectName = "filterId"; $selectName = "filterId";
$filterNames = array( ''=>translate('ChooseFilter') ); $filterNames = array( ''=>translate('ChooseFilter') );
foreach ( dbFetchAll( "select * from Filters order by Id" ) as $row ) { foreach ( dbFetchAll( "select * from Filters order by Name" ) as $row ) {
$filterNames[$row['Id']] = $row['Name']; $filterNames[$row['Id']] = $row['Name'];
if ( $row['Background'] ) if ( $row['Background'] )
$filterNames[$row['Id']] .= "*"; $filterNames[$row['Id']] .= "*";
@ -328,7 +328,7 @@ if ( ZM_OPT_MESSAGE ) {
<input type="button" value="<?php echo translate('Save') ?>" onclick="saveFilter( this );"/> <input type="button" value="<?php echo translate('Save') ?>" onclick="saveFilter( this );"/>
<?php } ?> <?php } ?>
<?php if ( canEdit( 'Events' ) && isset($dbFilter) && $dbFilter['Name'] ) { ?> <?php if ( canEdit( 'Events' ) && isset($dbFilter) && $dbFilter['Name'] ) { ?>
<input type="button" value="<?php echo translate('Delete') ?>" onclick="deleteFilter( this, '<?php echo $dbFilter['Name'] ?>' );"/> <input type="button" value="<?php echo translate('Delete') ?>" onclick="deleteFilter( this, <?php echo $dbFilter['Id'] ?>, '<?php echo $dbFilter['Name'] ?>' );"/>
<?php } ?> <?php } ?>
<input type="button" value="<?php echo translate('Reset') ?>" onclick="submitToFilter( this, 1 );"/> <input type="button" value="<?php echo translate('Reset') ?>" onclick="submitToFilter( this, 1 );"/>
</div> </div>