diff options
| author | Paul Arthur <paul.arthur@flowerysong.com> | 2013-05-13 18:44:00 -0400 |
|---|---|---|
| committer | Paul Arthur <paul.arthur@flowerysong.com> | 2013-05-13 19:43:11 -0400 |
| commit | 3ade42684d38d0b2b645962a4593d3ed5f1eeec6 (patch) | |
| tree | 2b6365c681806e5824eab6fc6f6c51c74d72d2ed /admin/catalog.php | |
| parent | f22ceb42c25af89f768469a43bb8dce055cda9be (diff) | |
| download | ampache-3ade42684d38d0b2b645962a4593d3ed5f1eeec6.tar.gz ampache-3ade42684d38d0b2b645962a4593d3ed5f1eeec6.tar.bz2 ampache-3ade42684d38d0b2b645962a4593d3ed5f1eeec6.zip | |
Fix 'foo all catalogs' via the web interface
Evidently Catalog::get_catalog_ids() wasn't quite as unused as I thought
it was.
Fixes GH #18
Diffstat (limited to 'admin/catalog.php')
| -rw-r--r-- | admin/catalog.php | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/admin/catalog.php b/admin/catalog.php index f2ae86a7..7262bb81 100644 --- a/admin/catalog.php +++ b/admin/catalog.php @@ -38,26 +38,25 @@ switch ($_REQUEST['action']) { require Config::get('prefix') . '/templates/flag.inc'; break; case 'add_to_all_catalogs': - $catalog = new Catalog(); - $_REQUEST['catalogs'] = $catalog->get_catalog_ids(); + $_REQUEST['catalogs'] = Catalog::get_catalogs(); case 'add_to_catalog': toggle_visible('ajax-loading'); ob_end_flush(); - if (Config::get('demo_mode')) { break; } + if (Config::get('demo_mode')) { break; } if ($_REQUEST['catalogs'] ) { foreach ($_REQUEST['catalogs'] as $catalog_id) { $catalog = new Catalog($catalog_id); $catalog->add_to_catalog(); } } - $url = Config::get('web_path') . '/admin/catalog.php'; - $title = T_('Catalog Updated'); - $body = ''; - show_confirmation($title,$body,$url); + $url = Config::get('web_path') . '/admin/catalog.php'; + $title = T_('Catalog Updated'); + $body = ''; + show_confirmation($title, $body, $url); toggle_visible('ajax-loading'); break; case 'update_all_catalogs': - $_REQUEST['catalogs'] = Catalog::get_catalog_ids(); + $_REQUEST['catalogs'] = Catalog::get_catalogs(); case 'update_catalog': toggle_visible('ajax-loading'); ob_end_flush(); @@ -83,7 +82,7 @@ switch ($_REQUEST['action']) { if (Config::get('demo_mode')) { UI::access_denied(); break; } if (!$_REQUEST['catalogs']) { - $_REQUEST['catalogs'] = Catalog::get_catalog_ids(); + $_REQUEST['catalogs'] = Catalog::get_catalogs(); } /* This runs the clean/verify/add in that order */ @@ -140,7 +139,7 @@ switch ($_REQUEST['action']) { break; case 'clean_all_catalogs': $catalog = new Catalog(); - $_REQUEST['catalogs'] = Catalog::get_catalog_ids(); + $_REQUEST['catalogs'] = Catalog::get_catalogs(); case 'clean_catalog': toggle_visible('ajax-loading'); ob_end_flush(); |