diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 62d917de03..8e7bee00df 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -89,7 +89,7 @@ class SearchController extends Controller $searcher->parseQuery($fullQuery); $searcher->setLimit((int)config('firefly.search_result_limit')); $groups = $searcher->searchTransactions(); - $searchTime = $searcher->searchTime(); // in seconds + $searchTime = round($searcher->searchTime(), 3); // in seconds try { $html = view('search.search', compact('groups','searchTime'))->render(); diff --git a/public/v1/js/ff/list/groups.js b/public/v1/js/ff/list/groups.js index 805cbb4cf5..7a705a0fdc 100644 --- a/public/v1/js/ff/list/groups.js +++ b/public/v1/js/ff/list/groups.js @@ -21,6 +21,9 @@ var count = 0; $(document).ready(function () { + updateListButtons(); +}); +function updateListButtons() { // top button to select all / deselect all: $('input[name="select-all"]').change(function () { if (this.checked) { @@ -46,9 +49,7 @@ $(document).ready(function () { countChecked(); updateActionButtons(); }); - - -}); +} /** * diff --git a/public/v1/js/ff/search/index.js b/public/v1/js/ff/search/index.js index c178767735..1543325e8a 100644 --- a/public/v1/js/ff/search/index.js +++ b/public/v1/js/ff/search/index.js @@ -42,17 +42,6 @@ function presentSearchResults(data) { $('.search_box').find('.overlay').remove(); $('.search_results').html(data.html).show(); - $('.select_all_single').unbind('change').change(function () { - countChecked(); - }); - // make sure select button works: - $('input[name="select_all"]').change(function () { - if (this.checked) { - checkAll(); - countChecked(); - } else { - uncheckAll(); - countChecked(); - } - }); + + updateListButtons(); } \ No newline at end of file diff --git a/resources/views/v1/list/groups.twig b/resources/views/v1/list/groups.twig index 827b7ad4ed..2800fb70f2 100644 --- a/resources/views/v1/list/groups.twig +++ b/resources/views/v1/list/groups.twig @@ -151,7 +151,7 @@ TODO: hide and show columns -