diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-12-24 00:57:36 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-12-24 00:57:36 +0000 |
| commit | 3d8ff28ac56f30075bd9c485e2ee94f486717e6f (patch) | |
| tree | 46413c2ccfc5d7f99a26ecb3fe6f23ac0a9278cd /templates | |
| parent | ee64379cf4c093d589502e72036759e66671cac7 (diff) | |
| download | ampache-3d8ff28ac56f30075bd9c485e2ee94f486717e6f.tar.gz ampache-3d8ff28ac56f30075bd9c485e2ee94f486717e6f.tar.bz2 ampache-3d8ff28ac56f30075bd9c485e2ee94f486717e6f.zip | |
fixed filters being applied incorrectly, and removed un-needed query on show album
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/show_album.inc.php | 1 | ||||
| -rw-r--r-- | templates/show_artist.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_playlist.inc.php | 1 | ||||
| -rw-r--r-- | templates/sidebar_browse.inc.php | 3 |
4 files changed, 5 insertions, 2 deletions
diff --git a/templates/show_album.inc.php b/templates/show_album.inc.php index 78944dbf..4bfd05e7 100644 --- a/templates/show_album.inc.php +++ b/templates/show_album.inc.php @@ -67,6 +67,7 @@ $title = scrub_out($album->name) . ' (' . $album->year . ') -- ' <?php $object_ids = $album->get_songs(); Browse::set_type('song'); + Browse::set_static_content(1); Browse::save_objects($object_ids); Browse::show_objects($object_ids); ?> diff --git a/templates/show_artist.inc.php b/templates/show_artist.inc.php index 9c598c08..720e36b5 100644 --- a/templates/show_artist.inc.php +++ b/templates/show_artist.inc.php @@ -26,7 +26,9 @@ require Config::get('prefix') . '/templates/show_artist_box.inc.php'; ?> <div id="browse_content"> <?php + Browse::reset_filters(); Browse::set_type('album'); + Browse::set_static_content(1); Browse::save_objects($albums); Browse::show_objects($albums); ?> diff --git a/templates/show_playlist.inc.php b/templates/show_playlist.inc.php index cd31488a..057fcec1 100644 --- a/templates/show_playlist.inc.php +++ b/templates/show_playlist.inc.php @@ -38,6 +38,7 @@ $web_path = Config::get('web_path'); $object_ids = $playlist->get_items(); Browse::set_type('playlist_song'); Browse::add_supplemental_object('playlist',$playlist->id); + Browse::set_static_content(1); Browse::save_objects($object_ids); Browse::show_objects($object_ids); ?> diff --git a/templates/sidebar_browse.inc.php b/templates/sidebar_browse.inc.php index 608f98bc..5c7ebe07 100644 --- a/templates/sidebar_browse.inc.php +++ b/templates/sidebar_browse.inc.php @@ -23,10 +23,9 @@ <?php echo _('Minimum Count'); ?><br /> <input type="checkbox" onclick="ajaxPut('<?php echo $ajax_info; ?>?action=browse&key=rated&value=1');return true;" value="1" /> <?php echo _('Rated'); ?><br /> - --> <input id="unplayedCB" type="checkbox" <?php echo $string = Browse::get_filter('unplayed') ? 'checked="checked"' : ''; ?>/> <label id="unplayedLabel" for="unplayedCB"><?php echo _('Unplayed'); ?></label><br /> - <?php echo Ajax::observe('unplayedCB','click',Ajax::action('?page=browse&action=browse&key=unplayed&value=1','')); ?> + --> <input id="show_artCB" type="checkbox" <?php echo $string = Browse::get_filter('show_art') ? 'checked="checked"' : ''; ?>/> <label id="show_artLabel" for="show_artCB"><?php echo _('Show Art'); ?></label><br /> <?php echo Ajax::observe('show_artCB','click',Ajax::action('?page=browse&action=browse&key=show_art&value=1','')); ?> |