diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2012-06-01 15:10:46 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2012-06-01 15:10:46 +0000 |
| commit | b52e834bd0bab530e98537d52b31d4b37f199739 (patch) | |
| tree | ff31dd4f6c2afaeae380f10dc691cde3cb4e6739 /modules/server_add | |
| parent | f5098f54b8279f468d94747b1156e15ea05d6d25 (diff) | |
| parent | 4c98b218316df00c8bf3eeb28a8324ec64348bff (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/server_add')
| -rw-r--r-- | modules/server_add/controllers/admin_server_add.php | 3 | ||||
| -rw-r--r-- | modules/server_add/views/admin_server_add.html.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/modules/server_add/controllers/admin_server_add.php b/modules/server_add/controllers/admin_server_add.php index 954c9ef6..5b75c02d 100644 --- a/modules/server_add/controllers/admin_server_add.php +++ b/modules/server_add/controllers/admin_server_add.php @@ -72,6 +72,7 @@ class Admin_Server_Add_Controller extends Admin_Controller { public function autocomplete() { $directories = array(); + $path_prefix = Input::instance()->get("q"); foreach (glob("{$path_prefix}*") as $file) { if (is_dir($file) && !is_link($file)) { @@ -79,7 +80,7 @@ class Admin_Server_Add_Controller extends Admin_Controller { } } - print implode("\n", $directories); + ajax::response(implode("\n", $directories)); } private function _get_admin_form() { diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php index 176cff72..f59e327f 100644 --- a/modules/server_add/views/admin_server_add.html.php +++ b/modules/server_add/views/admin_server_add.html.php @@ -4,7 +4,7 @@ <?= $theme->script("jquery.autocomplete.js") ?> <script type="text/javascript"> $("document").ready(function() { - $("#g-path").autocomplete( + $("#g-path").gallery_autocomplete( "<?= url::site("__ARGS__") ?>".replace("__ARGS__", "admin/server_add/autocomplete"), { max: 256, |