diff options
| author | dipsol <martin@diphoorn.com> | 2011-09-14 16:20:48 +0200 |
|---|---|---|
| committer | dipsol <martin@diphoorn.com> | 2011-09-14 16:20:48 +0200 |
| commit | fcc8ff2842b9cc5a6d70cc5d4c464ab962623863 (patch) | |
| tree | 0436094bbbb3b07b0bd4de1898672ca5ccf3c241 | |
| parent | 41c1e8b7108ff15070b68485df75134dc3003d8f (diff) | |
| download | ampache-fcc8ff2842b9cc5a6d70cc5d4c464ab962623863.tar.gz ampache-fcc8ff2842b9cc5a6d70cc5d4c464ab962623863.tar.bz2 ampache-fcc8ff2842b9cc5a6d70cc5d4c464ab962623863.zip | |
FS#189 Fixed dropdown selection
| -rw-r--r-- | server/browse.ajax.php | 5 | ||||
| -rw-r--r-- | templates/browse_filters.inc.php | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/server/browse.ajax.php b/server/browse.ajax.php index 2d4a16cf..de611575 100644 --- a/server/browse.ajax.php +++ b/server/browse.ajax.php @@ -59,9 +59,14 @@ switch ($_REQUEST['action']) { // Set the new sort value $browse->set_sort($_REQUEST['sort']); } + + if ($_REQUEST['catalog_key'] || $SESSION['catalog'] != 0) { $browse->set_filter('catalog',$_REQUEST['catalog_key']); $_SESSION['catalog'] = $_REQUEST['catalog_key']; + } elseif ($_REQUEST['catalog_key'] == 0) { + $browse->set_filter('catalog', null); + unset($_SESSION['catalog']); } ob_start(); diff --git a/templates/browse_filters.inc.php b/templates/browse_filters.inc.php index d3aec2b6..7fe310d0 100644 --- a/templates/browse_filters.inc.php +++ b/templates/browse_filters.inc.php @@ -82,11 +82,11 @@ $ajax_info = Config::get('ajax_url'); $web_path = Config::get('web_path'); } foreach( $results as $entries ) { - echo '<option value="' . $entries['id']; + echo '<option value="' . $entries['id'] . '" '; if( $_SESSION['catalog'] == $entries['id'] ) { echo ' selected="selected" '; } - echo '">' . $entries['name'] . '</options>'; + echo '>' . $entries['name'] . '</options>'; } ?> |